Fix incorrect creation of po files - take 2

(my first try (for pt) was not successful, corrupted characters in the po files):
- checkout rev. 68272 (revision before my commit with wrong po files)
- svn update en
- perform usual process to update po and pot files (with merge_xml.awk fixed by nabetaro, thanks!)
- copy changed files to my svn tree
- commit

M    po/ro/using-d-i.po
M    po/pt/partitioning.po
M    po/pt/install-methods.po
M    po/pt/random-bits.po
M    po/pt/preseed.po
M    po/pt/preparing.po
M    po/pt/welcome.po
M    po/pt/using-d-i.po
M    po/pt/hardware.po
M    po/pt/boot-installer.po
M    po/pt/installation-howto.po
M    po/da/boot-installer.po
M    po/ru/install-methods.po
M    po/ru/partitioning.po
M    po/ru/random-bits.po
M    po/ru/preseed.po
M    po/ru/welcome.po
M    po/ru/using-d-i.po
M    po/ru/hardware.po
M    po/ru/boot-installer.po
M    po/ru/installation-howto.po
M    po/sv/install-methods.po
M    po/sv/partitioning.po
M    po/sv/preseed.po
M    po/sv/using-d-i.po
M    po/sv/hardware.po
M    po/sv/boot-installer.po
M    po/sv/installation-howto.po
M    po/ja/install-methods.po
M    po/ja/partitioning.po
M    po/ja/preseed.po
M    po/ja/using-d-i.po
M    po/ja/hardware.po
M    po/ja/boot-installer.po
M    po/ja/installation-howto.po
M    po/zh_TW/install-methods.po
M    po/zh_TW/partitioning.po
M    po/zh_TW/using-d-i.po
M    po/zh_TW/hardware.po
M    po/zh_TW/boot-installer.po
M    po/zh_TW/installation-howto.po
M    po/fi/install-methods.po
M    po/fi/partitioning.po
M    po/fi/preseed.po
M    po/fi/using-d-i.po
M    po/fi/hardware.po
M    po/fi/boot-installer.po
M    po/fi/installation-howto.po
M    po/el/install-methods.po
M    po/el/partitioning.po
M    po/el/preseed.po
M    po/el/using-d-i.po
M    po/el/hardware.po
M    po/el/boot-installer.po
M    po/el/installation-howto.po
M    po/zh_CN/install-methods.po
M    po/zh_CN/partitioning.po
M    po/zh_CN/preseed.po
M    po/zh_CN/using-d-i.po
M    po/zh_CN/hardware.po
M    po/zh_CN/boot-installer.po
M    po/zh_CN/installation-howto.po
M    po/pot/random-bits.pot
M    po/pot/gpl.pot
M    po/pot/preseed.pot
M    po/pot/preparing.pot
M    po/pot/post-install.pot
M    po/pot/boot-new.pot
M    po/pot/welcome.pot
M    po/pot/using-d-i.pot
M    po/pot/hardware.pot
M    po/pot/boot-installer.pot
M    po/pot/installation-howto.pot
M    po/pot/administrivia.pot
M    po/pot/preface.pot
M    po/pot/bookinfo.pot
M    po/pot/install-methods.pot
M    po/pot/partitioning.pot
M    po/es/partitioning.po
M    po/es/install-methods.po
M    po/es/preseed.po
M    po/es/using-d-i.po
M    po/es/hardware.po
M    po/es/boot-installer.po
M    po/es/installation-howto.po
M    po/ko/install-methods.po
M    po/ko/partitioning.po
M    po/ko/preseed.po
M    po/ko/using-d-i.po
M    po/ko/hardware.po
M    po/ko/boot-installer.po
M    po/ko/installation-howto.po
M    po/hu/install-methods.po
M    po/hu/partitioning.po
M    po/hu/preseed.po
M    po/hu/using-d-i.po
M    po/hu/hardware.po
M    po/hu/boot-installer.po
M    po/hu/installation-howto.po
M    po/vi/install-methods.po
M    po/vi/partitioning.po
M    po/vi/preseed.po
M    po/vi/using-d-i.po
M    po/vi/hardware.po
M    po/vi/boot-installer.po
M    po/vi/installation-howto.po

1 files changed, 292 insertions, 301 deletions

diff --git a/po/ru/install-methods.po b/po/ru/install-methods.po
index ac313e6ef..5a2e8b99c 100644
--- a/po/ru/install-methods.po
+++ b/po/ru/install-methods.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: install-methods\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2012-07-20 14:12+0000\n"
-"PO-Revision-Date: 2012-10-21 09:12+0400\n"
+"POT-Creation-Date: 2012-10-24 19:53+0000\n"
+"PO-Revision-Date: 2012-10-14 09:43+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
 "Language: ru\n"
@@ -28,100 +28,92 @@ msgstr "Получение носителя с дистрибутивом"
 #. Tag: title
 #: install-methods.xml:12
 #, no-c-format
-#| msgid "Official &debian-gnu; CD/DVD-ROM Sets"
-msgid "Official &debian-gnu; CD-ROM Sets"
-msgstr "Официальный набор CD-ROM &debian-gnu;"
+msgid "Official &debian-gnu; CD/DVD-ROM Sets"
+msgstr "Официальный набор CD/DVD-ROM &debian-gnu;"
 
 #. Tag: para
 #: install-methods.xml:13
 #, no-c-format
-#| msgid ""
-#| "By far the easiest way to install &debian-gnu; is from an Official "
-#| "&debian; CD/DVD-ROM Set. You can buy a set from a vendor (see the <ulink "
-#| "url=\"&url-debian-cd-vendors;\">CD vendors page</ulink>). You may also "
-#| "download the CD/DVD-ROM images from a &debian; mirror and make your own "
-#| "set, if you have a fast network connection and a CD/DVD burner (see the "
-#| "<ulink url=\"&url-debian-cd;\">Debian CD page</ulink> and <ulink url="
-#| "\"&url-debian-cd-faq;\">Debian CD FAQ</ulink> for detailed instructions). "
-#| "If you have a &debian; CD/DVD set and CDs/DVDs are bootable on your "
-#| "machine<phrase arch=\"x86\">, which is the case on all modern PCs</"
-#| "phrase>, you can skip right to <xref linkend=\"boot-installer\"/>. Much "
-#| "effort has been expended to ensure the most-used files are on the first "
-#| "CDs and DVDs, so that a basic desktop installation can be done with only "
-#| "the first DVD or - to a limited extent - even with only the first CD."
 msgid ""
 "By far the easiest way to install &debian-gnu; is from an Official &debian; "
-"CD-ROM Set. You can buy a set from a vendor (see the <ulink url=\"&url-"
-"debian-cd-vendors;\">CD vendors page</ulink>). You may also download the CD-"
-"ROM images from a &debian; mirror and make your own set, if you have a fast "
-"network connection and a CD burner (see the <ulink url=\"&url-debian-cd;"
-"\">Debian CD page</ulink> for detailed instructions). If you have a &debian; "
-"CD set and CDs are bootable on your machine, you can skip right to <xref "
-"linkend=\"boot-installer\"/>; much effort has been expended to ensure the "
-"files most people need are there on the CD. Although a full set of binary "
-"packages requires several CDs, it is unlikely you will need packages on the "
-"third CD and above. You may also consider using the DVD version, which saves "
-"a lot of space on your shelf and you avoid the CD shuffling marathon."
+"CD/DVD-ROM Set. You can buy a set from a vendor (see the <ulink url=\"&url-"
+"debian-cd-vendors;\">CD vendors page</ulink>). You may also download the CD/"
+"DVD-ROM images from a &debian; mirror and make your own set, if you have a "
+"fast network connection and a CD/DVD burner (see the <ulink url=\"&url-"
+"debian-cd;\">Debian CD page</ulink> and <ulink url=\"&url-debian-cd-faq;"
+"\">Debian CD FAQ</ulink> for detailed instructions). If you have a &debian; "
+"CD/DVD set and CDs/DVDs are bootable on your machine<phrase arch=\"x86\">, "
+"which is the case on all modern PCs</phrase>, you can skip right to <xref "
+"linkend=\"boot-installer\"/>. Much effort has been expended to ensure the "
+"most-used files are on the first CDs and DVDs, so that a basic desktop "
+"installation can be done with only the first DVD or - to a limited extent - "
+"even with only the first CD."
 msgstr ""
 "Самым лёгким путём установки &debian-gnu; является установка с официального "
-"набора компакт-дисков &debian; (смотрите <ulink url=\"&url-debian-cd-vendors;"
+"набора CD/DVD-ROM &debian; (смотрите <ulink url=\"&url-debian-cd-vendors;"
 "\">страницу продавцов компакт-дисков Debian</ulink>). Также, вы можете "
-"загрузить образы компакт-дисков с сервера-зеркала &debian; и сделать из них "
+"загрузить образы CD/DVD-ROM с сервера-зеркала &debian; и сделать из них "
 "набор самостоятельно, если у вас есть высокоскоростное подключение к сети и "
-"устройство записи компакт-дисков (подробные инструкции смотрите на странице "
-"<ulink url=\"&url-debian-cd;\">Debian GNU/Linux на компакт-дисках</ulink>). "
-"Если у вас есть официальный набор компакт-дисков &debian; и машина способна "
-"загружаться с привода CD-ROM, то вы можете сразу перейти к <xref linkend="
-"\"boot-installer\"/>; много усилий было потрачено, чтобы добиться того, "
-"чтобы файлы на этих дисках стали полезными большому числу людей. Хотя полный "
-"набор готовых пакетов умещается на нескольких дисках, вряд ли вам "
-"понадобятся пакеты, расположенные на третьем и последующих дисках. Также вы "
-"можете подумать над использованием DVD версии, так как это сохранит место на "
-"вашей полке и вы избежите частой смены компакт-дисков в приводе."
+"устройство записи CD/DVD (подробные инструкции смотрите на странице <ulink "
+"url=\"&url-debian-cd;\">Debian GNU/Linux на компакт-дисках</ulink> и <ulink "
+"url=\"&url-debian-cd-faq;\">Debian CD FAQ</ulink>). Если у вас есть "
+"официальный набор компакт-дисков &debian; и машина способна загружаться с "
+"привода CD-ROM <phrase arch=\"x86\">(что верно для всех современных ПК)</"
+"phrase>, то вы можете сразу перейти к <xref linkend=\"boot-installer\"/>. "
+"Много усилий было потрачено на то, чтобы расположить самые используемые "
+"файлы на первый CD и DVD-диск, поэтому для установки базового рабочего стола "
+"достаточно только первого DVD или — в некоторых случаях — даже первого CD."
 
 #. Tag: para
 #: install-methods.xml:30
 #, no-c-format
-#| msgid ""
-#| "If your machine doesn't support CD booting<phrase arch=\"x86\"> (only "
-#| "relevant on very old PC systems)</phrase>, but you do have a CD set, you "
-#| "can use an alternative strategy such as <phrase condition=\"supports-"
-#| "floppy-boot\">floppy disk,</phrase> <phrase arch=\"s390\">tape, emulated "
-#| "tape,</phrase> <phrase condition=\"bootable-disk\">hard disk,</phrase> "
-#| "<phrase condition=\"bootable-usb\">usb stick,</phrase> <phrase condition="
-#| "\"supports-tftp\">net boot,</phrase> or manually loading the kernel from "
-#| "the CD to initially boot the system installer. The files you need for "
-#| "booting by another means are also on the CD; the &debian; network archive "
-#| "and CD folder organization are identical. So when archive file paths are "
-#| "given below for particular files you need for booting, look for those "
-#| "files in the same directories and subdirectories on your CD."
-msgid ""
-"If your machine doesn't support CD booting, but you do have a CD set, you "
-"can use an alternative strategy such as <phrase condition=\"supports-floppy-"
-"boot\">floppy disk,</phrase> <phrase arch=\"s390\">tape, emulated tape,</"
-"phrase> <phrase condition=\"bootable-disk\">hard disk,</phrase> <phrase "
-"condition=\"bootable-usb\">usb stick,</phrase> <phrase condition=\"supports-"
-"tftp\">net boot,</phrase> or manually loading the kernel from the CD to "
-"initially boot the system installer. The files you need for booting by "
-"another means are also on the CD; the &debian; network archive and CD folder "
-"organization are identical. So when archive file paths are given below for "
-"particular files you need for booting, look for those files in the same "
-"directories and subdirectories on your CD."
-msgstr ""
-"Если машина не поддерживает загрузку с компакт-диска, а вы имеете набор CD, "
-"то для загрузки программы установки можно воспользоваться другим методом, "
-"например, загрузить ядро <phrase condition=\"supports-floppy-boot\">с "
-"дискеты,</phrase> <phrase arch=\"s390\">с ленты, виртуальной ленты,</phrase> "
-"<phrase condition=\"bootable-disk\">с жёсткого диска,</phrase> <phrase "
-"condition=\"bootable-usb\">с карт памяти usb,</phrase> <phrase condition="
-"\"supports-tftp\">по сети,</phrase> или вручную с CD. Для этого на компакт-"
-"диске есть все файлы; структура архива &debian; в сети и каталогов CD "
-"идентичны. Поэтому, когда ниже встречаются пути к файлам в архиве, которые "
-"требуются для определённого вида загрузки, поищите эти файлы в тех же "
-"каталогах и подкаталогах на ваших CD."
-
-#. Tag: para
-#: install-methods.xml:52
+msgid ""
+"As CDs have a rather limited capacity by today's standards, not all "
+"graphical desktop environments are installable with only the first CD; only "
+"XFCE (which is the default desktop environment installed by &debian-gnu; "
+"&release;) completely fits on the first CD. For all other desktop "
+"environments a CD installation requires either network connectivity during "
+"the installation to download the remaining files or additional CDs."
+msgstr ""
+"При сегодняшних объёмах, на CD-диск можно не так много уместить, например, "
+"не каждое окружение рабочего стола можно установить имея только первый CD; "
+"только XFCE (является окружением рабочего стола, которое устанавливается в "
+"&debian-gnu; &release; по умолчанию) полностью умещается на первом CD. При "
+"установке всех остальных окружений рабочего стола с CD требуется или "
+"подключение к сети, или дополнительные диски."
+
+#. Tag: para
+#: install-methods.xml:39
+#, no-c-format
+msgid ""
+"If your machine doesn't support CD booting<phrase arch=\"x86\"> (only "
+"relevant on very old PC systems)</phrase>, but you do have a CD set, you can "
+"use an alternative strategy such as <phrase condition=\"supports-floppy-boot"
+"\">floppy disk,</phrase> <phrase arch=\"s390\">tape, emulated tape,</phrase> "
+"<phrase condition=\"bootable-disk\">hard disk,</phrase> <phrase condition="
+"\"bootable-usb\">usb stick,</phrase> <phrase condition=\"supports-tftp\">net "
+"boot,</phrase> or manually loading the kernel from the CD to initially boot "
+"the system installer. The files you need for booting by another means are "
+"also on the CD; the &debian; network archive and CD folder organization are "
+"identical. So when archive file paths are given below for particular files "
+"you need for booting, look for those files in the same directories and "
+"subdirectories on your CD."
+msgstr ""
+"Если машина не поддерживает загрузку с компакт-диска<phrase arch=\"x86\"> "
+"(верно только для очень старых ПК)</phrase>, а вы имеете набор CD, то для "
+"загрузки программы установки можно воспользоваться другим методом, например, "
+"загрузить ядро <phrase condition=\"supports-floppy-boot\">с дискеты,</"
+"phrase> <phrase arch=\"s390\">с ленты, виртуальной ленты,</phrase> <phrase "
+"condition=\"bootable-disk\">с жёсткого диска,</phrase> <phrase condition="
+"\"bootable-usb\">с карт памяти usb,</phrase> <phrase condition=\"supports-"
+"tftp\">по сети,</phrase> или вручную с CD. Для этого на компакт-диске есть "
+"все файлы; структура архива &debian; в сети и каталогов CD идентичны. "
+"Поэтому, когда ниже встречаются пути к файлам в архиве, которые требуются "
+"для определённого вида загрузки, поищите эти файлы в тех же каталогах и "
+"подкаталогах на ваших CD."
+
+#. Tag: para
+#: install-methods.xml:62
 #, no-c-format
 msgid ""
 "Once the installer is booted, it will be able to obtain all the other files "
@@ -131,7 +123,7 @@ msgstr ""
 "файлы с компакт-дисков."
 
 #. Tag: para
-#: install-methods.xml:57
+#: install-methods.xml:67
 #, no-c-format
 msgid ""
 "If you don't have a CD set, then you will need to download the installer "
@@ -150,13 +142,13 @@ msgstr ""
 "использовать их для загрузки программы установки."
 
 #. Tag: title
-#: install-methods.xml:83
+#: install-methods.xml:93
 #, no-c-format
 msgid "Downloading Files from &debian; Mirrors"
 msgstr "Скачивание файлов с серверов-зеркал &debian;"
 
 #. Tag: para
-#: install-methods.xml:85
+#: install-methods.xml:95
 #, no-c-format
 msgid ""
 "To find the nearest (and thus probably the fastest) mirror, see the <ulink "
@@ -167,7 +159,7 @@ msgstr ""
 "ulink>."
 
 #. Tag: para
-#: install-methods.xml:90
+#: install-methods.xml:100
 #, no-c-format
 msgid ""
 "When downloading files from a &debian; mirror using FTP, be sure to download "
@@ -178,13 +170,13 @@ msgstr ""
 "автоматическом режиме."
 
 #. Tag: title
-#: install-methods.xml:98
+#: install-methods.xml:108
 #, no-c-format
 msgid "Where to Find Installation Images"
 msgstr "Где искать установочные образы"
 
 #. Tag: para
-#: install-methods.xml:100
+#: install-methods.xml:110
 #, no-c-format
 msgid ""
 "The installation images are located on each &debian; mirror in the directory "
@@ -200,13 +192,13 @@ msgstr ""
 "предназначен каждый образ."
 
 #. Tag: title
-#: install-methods.xml:113
+#: install-methods.xml:123
 #, no-c-format
 msgid "Thecus N2100 Installation Files"
 msgstr "Файлы установки для Thecus N2100"
 
 #. Tag: para
-#: install-methods.xml:114
+#: install-methods.xml:124
 #, no-c-format
 msgid ""
 "A firmware image is provided for the Thecus N2100 which will automatically "
@@ -220,13 +212,13 @@ msgstr ""
 "микропрограммы можно получить из &n2100-firmware-img;."
 
 #. Tag: title
-#: install-methods.xml:125
+#: install-methods.xml:135
 #, no-c-format
 msgid "GLAN Tank Installation Files"
 msgstr "Файлы установки для GLAN Tank"
 
 #. Tag: para
-#: install-methods.xml:126
+#: install-methods.xml:136
 #, no-c-format
 msgid ""
 "The GLAN Tank requires a kernel and ramdisk on an ext2 partition on the disk "
@@ -238,13 +230,13 @@ msgstr ""
 "получить из &glantank-firmware-img;."
 
 #. Tag: title
-#: install-methods.xml:136
+#: install-methods.xml:146
 #, no-c-format
 msgid "Kurobox Pro Installation Files"
 msgstr "Файлы установки для Kurobox Pro"
 
 #. Tag: para
-#: install-methods.xml:137
+#: install-methods.xml:147
 #, no-c-format
 msgid ""
 "The Kurobox Pro requires a kernel and ramdisk on an ext2 partition on the "
@@ -256,13 +248,13 @@ msgstr ""
 "получить из &kuroboxpro-firmware-img;."
 
 #. Tag: title
-#: install-methods.xml:147
+#: install-methods.xml:157
 #, no-c-format
 msgid "HP mv2120 Installation Files"
 msgstr "Файлы установки для HP mv2120"
 
 #. Tag: para
-#: install-methods.xml:148
+#: install-methods.xml:158
 #, no-c-format
 msgid ""
 "A firmware image is provided for the HP mv2120 which will automatically boot "
@@ -278,13 +270,13 @@ msgstr ""
 "можно получить из &mv2120-firmware-img;."
 
 #. Tag: title
-#: install-methods.xml:160
+#: install-methods.xml:170
 #, no-c-format
 msgid "QNAP Turbo Station Installation Files"
 msgstr "Файлы установки для QNAP Turbo Station"
 
 #. Tag: para
-#: install-methods.xml:161
+#: install-methods.xml:171
 #, no-c-format
 msgid ""
 "The installation files for the QNAP Turbo Station consist of a kernel and "
@@ -298,35 +290,51 @@ msgstr ""
 "TS-41x из &qnap-kirkwood-firmware-img;."
 
 #. Tag: title
-#: install-methods.xml:172
+#: install-methods.xml:182
 #, no-c-format
 msgid "Plug Computer and OpenRD Installation Files"
 msgstr "Файлы установки для Plug Computer и OpenRD"
 
 #. Tag: para
-#: install-methods.xml:173
+#: install-methods.xml:183
 #, no-c-format
-#| msgid ""
-#| "The installation files for plug computers (SheevaPlug, GuruPlug, "
-#| "DreamPlug etc) and OpenRD devices consist of a kernel and initrd for U-"
-#| "Boot. You can obtain these files from &kirkwood-marvell-firmware-img;."
 msgid ""
-"The installation files for plug computers (SheevaPlug, GuruPlug, etc) and "
-"OpenRD devices consist of a kernel and initrd for U-Boot. You can obtain "
-"these files from &kirkwood-marvell-firmware-img;."
+"The installation files for plug computers (SheevaPlug, GuruPlug, DreamPlug "
+"etc) and OpenRD devices consist of a kernel and initrd for U-Boot. You can "
+"obtain these files from &kirkwood-marvell-firmware-img;."
 msgstr ""
 "Файлы установки для устройств, втыкающих в розетку (SheevaPlug, GuruPlug, "
-"и т. д.) и OpenRD, представляют собой ядро и initrd для U-Boot. Вы "
+"DreamPlug и т. д.) и OpenRD, представляют собой ядро и initrd для U-Boot. Вы "
 "можете получить эти файлы из &kirkwood-marvell-firmware-img;."
 
 #. Tag: title
-#: install-methods.xml:223
+#: install-methods.xml:193
+#, no-c-format
+msgid "LaCie NASes Installation Files"
+msgstr "Файлы установки для серверов сетевого доступа LaCie"
+
+#. Tag: para
+#: install-methods.xml:194
+#, no-c-format
+msgid ""
+"The installation files for LaCie NASes (Network Space v2, Network Space Max "
+"v2, Internet Space v2, d2 Network v2, 2Big Network v2 and 5Big Network v2) "
+"consist of a kernel and initrd for U-Boot. You can obtain these files from "
+"&lacie-kirkwood-firmware-img;."
+msgstr ""
+"Файлы установки для серверов сетевого доступа LaCie (Network Space v2, "
+"Network Space Max v2, Internet Space v2, d2 Network v2, 2Big Network v2 и "
+"5Big Network v2) представляют собой ядро и initrd для U-Boot. Вы можете "
+"получить эти файлы из &lacie-kirkwood-firmware-img;."
+
+#. Tag: title
+#: install-methods.xml:245
 #, no-c-format
 msgid "Creating an IPL tape"
 msgstr "Создание ленты IPL"
 
 #. Tag: para
-#: install-methods.xml:225
+#: install-methods.xml:247
 #, no-c-format
 msgid ""
 "If you can't boot (IPL) from the CD-ROM and you are not using VM you need to "
@@ -348,13 +356,13 @@ msgstr ""
 "<xref linkend=\"where-files\"/>."
 
 #. Tag: title
-#: install-methods.xml:249
+#: install-methods.xml:271
 #, no-c-format
 msgid "Creating Floppies from Disk Images"
 msgstr "Создание дискет из образов дисков"
 
 #. Tag: para
-#: install-methods.xml:250
+#: install-methods.xml:272
 #, no-c-format
 msgid ""
 "Bootable floppy disks are generally used as a last resort to boot the "
@@ -365,7 +373,7 @@ msgstr ""
 "загружаться с CD или каким-то другим способом."
 
 #. Tag: para
-#: install-methods.xml:255
+#: install-methods.xml:277
 #, no-c-format
 msgid ""
 "Booting the installer from floppy disk reportedly fails on Mac USB floppy "
@@ -374,7 +382,7 @@ msgstr ""
 "Загрузка программы установки с дискет не работает в дисководах Mac USB."
 
 #. Tag: para
-#: install-methods.xml:260
+#: install-methods.xml:282
 #, no-c-format
 msgid ""
 "Disk images are files containing the complete contents of a floppy disk in "
@@ -395,7 +403,7 @@ msgstr ""
 "копирования</emphasis> данных из файла на дискету."
 
 #. Tag: para
-#: install-methods.xml:271
+#: install-methods.xml:293
 #, no-c-format
 msgid ""
 "There are different techniques for creating floppies from disk images. This "
@@ -407,7 +415,7 @@ msgstr ""
 "различных платформах."
 
 #. Tag: para
-#: install-methods.xml:277
+#: install-methods.xml:299
 #, no-c-format
 msgid ""
 "Before you can create the floppies, you will first need to download them "
@@ -422,7 +430,7 @@ msgstr ""
 "образы дискет могут быть уже на этих CD/DVD.</phrase>"
 
 #. Tag: para
-#: install-methods.xml:285
+#: install-methods.xml:307
 #, no-c-format
 msgid ""
 "No matter which method you use to create your floppies, you should remember "
@@ -434,13 +442,13 @@ msgstr ""
 "непреднамеренно не повредить их."
 
 #. Tag: title
-#: install-methods.xml:293
+#: install-methods.xml:315
 #, no-c-format
 msgid "Writing Disk Images From a Linux or Unix System"
 msgstr "Запись образов дисков из систем Linux или Unix"
 
 #. Tag: para
-#: install-methods.xml:294
+#: install-methods.xml:316
 #, no-c-format
 msgid ""
 "To write the floppy disk image files to the floppy disks, you will probably "
@@ -476,7 +484,7 @@ msgstr ""
 "смотрите страницу руководства)</phrase>."
 
 #. Tag: para
-#: install-methods.xml:315
+#: install-methods.xml:337
 #, no-c-format
 msgid ""
 "Some systems attempt to automatically mount a floppy disk when you place it "
@@ -511,7 +519,7 @@ msgstr ""
 "спросите вашего системного администратора. </phrase>"
 
 #. Tag: para
-#: install-methods.xml:336
+#: install-methods.xml:358
 #, no-c-format
 msgid ""
 "If writing a floppy on powerpc Linux, you will need to eject it. The "
@@ -523,13 +531,13 @@ msgstr ""
 "потребоваться её установка."
 
 #. Tag: title
-#: install-methods.xml:354
+#: install-methods.xml:376
 #, no-c-format
 msgid "Writing Disk Images From DOS, Windows, or OS/2"
 msgstr "Запись образов дисков из DOS, Windows или OS/2"
 
 #. Tag: para
-#: install-methods.xml:356
+#: install-methods.xml:378
 #, no-c-format
 msgid ""
 "If you have access to an i386 or amd64 machine, you can use one of the "
@@ -539,7 +547,7 @@ msgstr ""
 "на дискеты вы можете воспользоваться одной из программ, упомянутых ниже."
 
 #. Tag: para
-#: install-methods.xml:361
+#: install-methods.xml:383
 #, no-c-format
 msgid ""
 "The <command>rawrite1</command> and <command>rawrite2</command> programs can "
@@ -555,7 +563,7 @@ msgstr ""
 "emphasis> сработает."
 
 #. Tag: para
-#: install-methods.xml:369
+#: install-methods.xml:391
 #, no-c-format
 msgid ""
 "The <command>rwwrtwin</command> program runs on Windows 95, NT, 98, 2000, "
@@ -567,7 +575,7 @@ msgstr ""
 "распаковать diskio.dll в тот же самый каталог."
 
 #. Tag: para
-#: install-methods.xml:375
+#: install-methods.xml:397
 #, no-c-format
 msgid ""
 "These tools can be found on the Official &debian; CD-ROMs under the "
@@ -577,13 +585,13 @@ msgstr ""
 "<filename>/tools</filename>."
 
 #. Tag: title
-#: install-methods.xml:388
+#: install-methods.xml:410
 #, no-c-format
 msgid "Writing Disk Images From MacOS"
 msgstr "Запись образов дисков из MacOS"
 
 #. Tag: para
-#: install-methods.xml:389
+#: install-methods.xml:411
 #, no-c-format
 msgid ""
 "An AppleScript, <application>Make &debian; Floppy</application>, is "
@@ -604,7 +612,7 @@ msgstr ""
 "стереть дискету и записать на неё образ файла."
 
 #. Tag: para
-#: install-methods.xml:400
+#: install-methods.xml:422
 #, no-c-format
 msgid ""
 "You can also use the MacOS utility <command>Disk Copy</command> directly, or "
@@ -618,13 +626,13 @@ msgstr ""
 "следующих методов для создания дискеты из образа."
 
 #. Tag: title
-#: install-methods.xml:411
+#: install-methods.xml:433
 #, no-c-format
 msgid "Writing Disk Images with <command>Disk Copy</command>"
 msgstr "Запись образов дисков с помощью <command>Disk Copy</command>"
 
 #. Tag: para
-#: install-methods.xml:412
+#: install-methods.xml:434
 #, no-c-format
 msgid ""
 "If you are creating the floppy image from files which were originally on the "
@@ -638,7 +646,7 @@ msgstr ""
 "файлы образов с сервера-зеркала &debian;."
 
 #. Tag: para
-#: install-methods.xml:421
+#: install-methods.xml:443
 #, no-c-format
 msgid ""
 "Obtain <ulink url=\"&url-powerpc-creator-changer;\">Creator-Changer</ulink> "
@@ -648,7 +656,7 @@ msgstr ""
 "ulink> и используйте его для открытия файла <filename>root.bin</filename>."
 
 #. Tag: para
-#: install-methods.xml:428
+#: install-methods.xml:450
 #, no-c-format
 msgid ""
 "Change the Creator to <userinput>ddsk</userinput> (Disk Copy), and the Type "
@@ -660,7 +668,7 @@ msgstr ""
 "данных важен."
 
 #. Tag: para
-#: install-methods.xml:435
+#: install-methods.xml:457
 #, no-c-format
 msgid ""
 "<emphasis>Important:</emphasis> In the Finder, use <userinput>Get Info</"
@@ -676,7 +684,7 @@ msgstr ""
 "смонтирован."
 
 #. Tag: para
-#: install-methods.xml:444
+#: install-methods.xml:466
 #, no-c-format
 msgid ""
 "Obtain <command>Disk Copy</command>; if you have a MacOS system or CD it "
@@ -688,7 +696,7 @@ msgstr ""
 "diskcopy;\"></ulink>."
 
 #. Tag: para
-#: install-methods.xml:451
+#: install-methods.xml:473
 #, no-c-format
 msgid ""
 "Run <command>Disk Copy</command>, and select <menuchoice> "
@@ -705,13 +713,13 @@ msgstr ""
 "вылезет из дисковода."
 
 #. Tag: title
-#: install-methods.xml:466
+#: install-methods.xml:488
 #, no-c-format
 msgid "Writing Disk Images with <command>suntar</command>"
 msgstr "Запись образов дисков с помощью <command>suntar</command>"
 
 #. Tag: para
-#: install-methods.xml:470
+#: install-methods.xml:492
 #, no-c-format
 msgid ""
 "Obtain <command>suntar</command> from <ulink url=\"&url-powerpc-suntar;\"> </"
@@ -724,14 +732,14 @@ msgstr ""
 "<quote>Overwrite Sectors...</quote> из меню <userinput>Special</userinput>."
 
 #. Tag: para
-#: install-methods.xml:478
+#: install-methods.xml:500
 #, no-c-format
 msgid ""
 "Insert the floppy disk as requested, then hit &enterkey; (start at sector 0)."
 msgstr "Вставьте дискету, нажмите &enterkey; (начало с сектора 0)."
 
 #. Tag: para
-#: install-methods.xml:484
+#: install-methods.xml:506
 #, no-c-format
 msgid ""
 "Select the <filename>root.bin</filename> file in the file-opening dialog."
@@ -739,7 +747,7 @@ msgstr ""
 "Выберите файл <filename>root.bin</filename> в появившемся диалоговом окне."
 
 #. Tag: para
-#: install-methods.xml:489
+#: install-methods.xml:511
 #, no-c-format
 msgid ""
 "After the floppy has been created successfully, select <menuchoice> "
@@ -752,7 +760,7 @@ msgstr ""
 "ошибки при записи дискеты, просто выньте эту и вставьте другую дискету."
 
 #. Tag: para
-#: install-methods.xml:497
+#: install-methods.xml:519
 #, no-c-format
 msgid ""
 "Before using the floppy you created, <emphasis>set the write protect tab</"
@@ -764,13 +772,13 @@ msgstr ""
 "просто испортит её."
 
 #. Tag: title
-#: install-methods.xml:516
+#: install-methods.xml:538
 #, no-c-format
 msgid "Preparing Files for USB Memory Stick Booting"
 msgstr "Подготовка файлов для загрузки с карты памяти USB"
 
 #. Tag: para
-#: install-methods.xml:518
+#: install-methods.xml:540
 #, no-c-format
 msgid ""
 "To prepare the USB stick, you will need a system where GNU/Linux is already "
@@ -793,7 +801,7 @@ msgstr ""
 "Также выключите защиту от записи на карту."
 
 #. Tag: para
-#: install-methods.xml:531
+#: install-methods.xml:553
 #, no-c-format
 msgid ""
 "The procedures described in this section will destroy anything already on "
@@ -807,13 +815,13 @@ msgstr ""
 "например, на жёстком диске."
 
 #. Tag: title
-#: install-methods.xml:541
+#: install-methods.xml:563
 #, no-c-format
 msgid "Preparing a USB stick using a hybrid CD or DVD image"
 msgstr "Подготовка карты памяти USB из гибридного образа CD или DVD"
 
 #. Tag: para
-#: install-methods.xml:542
+#: install-methods.xml:564
 #, no-c-format
 msgid ""
 "Debian CD and DVD images can now be written directly a USB stick, which is a "
@@ -827,7 +835,7 @@ msgstr ""
 "получить образ CD или DVD, читайте <xref linkend=\"official-cdrom\"/>."
 
 #. Tag: para
-#: install-methods.xml:549
+#: install-methods.xml:571
 #, no-c-format
 msgid ""
 "Alternatively, for very small USB sticks, only a few megabytes in size, you "
@@ -841,7 +849,7 @@ msgstr ""
 "files\"/>)."
 
 #. Tag: para
-#: install-methods.xml:557
+#: install-methods.xml:579
 #, no-c-format
 msgid ""
 "A special method can be used to add firmware to the <filename>mini.iso</"
@@ -859,7 +867,7 @@ msgstr ""
 "нужно смонтировать второй и распаковать микропрограмму на него."
 
 #. Tag: screen
-#: install-methods.xml:567
+#: install-methods.xml:589
 #, no-c-format
 msgid ""
 "# mount /dev/<replaceable>sdX2</replaceable> /mnt\n"
@@ -875,7 +883,7 @@ msgstr ""
 "# umount"
 
 #. Tag: para
-#: install-methods.xml:573
+#: install-methods.xml:595
 #, no-c-format
 msgid ""
 "The CD or DVD image you choose should be written directly to the USB stick, "
@@ -889,7 +897,7 @@ msgstr ""
 "(предварительно отмонтировав):"
 
 #. Tag: screen
-#: install-methods.xml:580
+#: install-methods.xml:602
 #, no-c-format
 msgid ""
 "<prompt>#</prompt> <userinput>cp <replaceable>debian.iso</replaceable> /dev/"
@@ -901,7 +909,7 @@ msgstr ""
 "<prompt>#</prompt> <userinput>sync</userinput>"
 
 #. Tag: para
-#: install-methods.xml:582
+#: install-methods.xml:604
 #, no-c-format
 msgid ""
 "Simply writing the CD or DVD image to USB like this should work fine for "
@@ -913,13 +921,13 @@ msgstr ""
 "предназначены для людей, у которых есть дополнительные требования."
 
 #. Tag: title
-#: install-methods.xml:593
+#: install-methods.xml:615
 #, no-c-format
 msgid "Manually copying files to the USB stick"
 msgstr "Копирование файлов на карту памяти USB вручную"
 
 #. Tag: para
-#: install-methods.xml:594
+#: install-methods.xml:616
 #, no-c-format
 msgid ""
 "An alternative way to set up your USB stick is to manually copy the "
@@ -933,7 +941,7 @@ msgstr ""
 "<xref linkend=\"usb-copy-flexible\"/>)."
 
 #. Tag: para
-#: install-methods.xml:601
+#: install-methods.xml:623
 #, no-c-format
 msgid ""
 "There is an all-in-one file <filename>hd-media/boot.img.gz</filename> which "
@@ -949,7 +957,7 @@ msgstr ""
 "classname> и его файл настройки</phrase>."
 
 #. Tag: para
-#: install-methods.xml:610
+#: install-methods.xml:632
 #, no-c-format
 msgid ""
 "Note that, although convenient, this method does have one major "
@@ -965,20 +973,20 @@ msgstr ""
 "другой цели."
 
 #. Tag: para
-#: install-methods.xml:618
+#: install-methods.xml:640
 #, no-c-format
 msgid "To use this image simply extract it directly to your USB stick:"
 msgstr ""
 "Чтобы использовать образ, просто распакуйте его прямо на карту памяти USB:"
 
 #. Tag: screen
-#: install-methods.xml:622
+#: install-methods.xml:644
 #, no-c-format
 msgid "# zcat boot.img.gz &gt; /dev/<replaceable>sdX</replaceable>"
 msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sdX</replaceable>"
 
 #. Tag: para
-#: install-methods.xml:624
+#: install-methods.xml:646
 #, no-c-format
 msgid ""
 "Create a partition of type \"Apple_Bootstrap\" on your USB stick using "
@@ -990,23 +998,32 @@ msgstr ""
 "образ на этот раздел:"
 
 #. Tag: screen
-#: install-methods.xml:630
+#: install-methods.xml:652
 #, no-c-format
 msgid "# zcat boot.img.gz &gt; /dev/<replaceable>sdX2</replaceable>"
 msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sdX2</replaceable>"
 
 #. Tag: para
-#: install-methods.xml:632
-#, no-c-format
+#: install-methods.xml:654
+#, fuzzy, no-c-format
+#| msgid ""
+#| "After that, mount the USB memory stick <phrase arch=\"x86\">"
+#| "(<userinput>mount /dev/<replaceable>sdX</replaceable> /mnt</userinput>),</"
+#| "phrase> <phrase arch=\"powerpc\">(<userinput>mount /dev/"
+#| "<replaceable>sdX2</replaceable> /mnt</userinput>),</phrase> which will "
+#| "now have <phrase arch=\"x86\">a FAT filesystem</phrase> <phrase arch="
+#| "\"powerpc\">an HFS filesystem</phrase> on it, and copy a &debian; ISO "
+#| "image (netinst, businesscard, or full CD) to it. Unmount the stick "
+#| "(<userinput>umount /mnt</userinput>) and you are done."
 msgid ""
 "After that, mount the USB memory stick <phrase arch=\"x86\">"
 "(<userinput>mount /dev/<replaceable>sdX</replaceable> /mnt</userinput>),</"
 "phrase> <phrase arch=\"powerpc\">(<userinput>mount /dev/<replaceable>sdX2</"
 "replaceable> /mnt</userinput>),</phrase> which will now have <phrase arch="
 "\"x86\">a FAT filesystem</phrase> <phrase arch=\"powerpc\">an HFS "
-"filesystem</phrase> on it, and copy a &debian; ISO image (netinst, "
-"businesscard, or full CD) to it. Unmount the stick (<userinput>umount /mnt</"
-"userinput>) and you are done."
+"filesystem</phrase> on it, and copy a &debian; ISO image (netinst or full "
+"CD) to it. Unmount the stick (<userinput>umount /mnt</userinput>) and you "
+"are done."
 msgstr ""
 "После этого, смонтируйте карту памяти USB <phrase arch=\"x86\">"
 "(<userinput>mount /dev/<replaceable>sdX</replaceable> /mnt</userinput>),</"
@@ -1018,13 +1035,13 @@ msgstr ""
 "mnt</userinput>) и всё готово."
 
 #. Tag: title
-#: install-methods.xml:649
+#: install-methods.xml:671
 #, no-c-format
 msgid "Manually copying files to the USB stick &mdash; the flexible way"
 msgstr "Копирование файлов на карту памяти USB вручную &mdash; гибкий путь"
 
 #. Tag: para
-#: install-methods.xml:650
+#: install-methods.xml:672
 #, no-c-format
 msgid ""
 "If you like more flexibility or just want to know what's going on, you "
@@ -1040,13 +1057,13 @@ msgstr ""
 "образ CD ISO."
 
 #. Tag: title
-#: install-methods.xml:665 install-methods.xml:787
+#: install-methods.xml:687 install-methods.xml:809
 #, no-c-format
 msgid "Partitioning the USB stick"
 msgstr "Разметка карты памяти USB"
 
 #. Tag: para
-#: install-methods.xml:666
+#: install-methods.xml:688
 #, no-c-format
 msgid ""
 "We will show how to set up the memory stick to use the first partition, "
@@ -1056,7 +1073,7 @@ msgstr ""
 "устройство."
 
 #. Tag: para
-#: install-methods.xml:671
+#: install-methods.xml:693
 #, no-c-format
 msgid ""
 "Since most USB sticks come pre-configured with a single FAT16 partition, you "
@@ -1091,7 +1108,7 @@ msgstr ""
 "&debian; <classname>dosfstools</classname>."
 
 #. Tag: para
-#: install-methods.xml:695
+#: install-methods.xml:717
 #, no-c-format
 msgid ""
 "In order to start the kernel after booting from the USB stick, we will put a "
@@ -1110,7 +1127,7 @@ msgstr ""
 "поддерживает файловую систему FAT."
 
 #. Tag: para
-#: install-methods.xml:705
+#: install-methods.xml:727
 #, no-c-format
 msgid ""
 "To put <classname>syslinux</classname> on the FAT16 partition on your USB "
@@ -1133,13 +1150,13 @@ msgstr ""
 "<filename>ldlinux.sys</filename>, который содержит код системного загрузчика."
 
 #. Tag: title
-#: install-methods.xml:722 install-methods.xml:834
+#: install-methods.xml:744 install-methods.xml:856
 #, no-c-format
 msgid "Adding the installer image"
 msgstr "Добавление образа программы установки"
 
 #. Tag: para
-#: install-methods.xml:723
+#: install-methods.xml:745
 #, no-c-format
 msgid ""
 "Mount the partition (<userinput>mount /dev/<replaceable>sdX1</replaceable> /"
@@ -1165,7 +1182,7 @@ msgstr ""
 "именами DOS (8.3)."
 
 #. Tag: para
-#: install-methods.xml:747
+#: install-methods.xml:769
 #, no-c-format
 msgid ""
 "Next you should create a <filename>syslinux.cfg</filename> configuration "
@@ -1190,7 +1207,7 @@ msgstr ""
 "добавлять и другие параметры."
 
 #. Tag: para
-#: install-methods.xml:759
+#: install-methods.xml:781
 #, no-c-format
 msgid ""
 "To enable the boot prompt to permit further parameter appending, add a "
@@ -1200,16 +1217,24 @@ msgstr ""
 "параметров, добавьте строку <userinput>prompt 1</userinput>."
 
 #. Tag: para
-#: install-methods.xml:764 install-methods.xml:874
-#, no-c-format
+#: install-methods.xml:786 install-methods.xml:896
+#, fuzzy, no-c-format
+#| msgid ""
+#| "If you used an <filename>hd-media</filename> image, you should now copy "
+#| "the ISO file of a &debian; ISO image<footnote> <para> You can use either "
+#| "a businesscard, a netinst or a full CD image (see <xref linkend="
+#| "\"official-cdrom\"/>). Be sure to select one that fits. Note that the "
+#| "<quote>netboot <filename>mini.iso</filename></quote> image is not usable "
+#| "for this purpose. </para> </footnote> onto the stick. When you are done, "
+#| "unmount the USB memory stick (<userinput>umount /mnt</userinput>)."
 msgid ""
 "If you used an <filename>hd-media</filename> image, you should now copy the "
 "ISO file of a &debian; ISO image<footnote> <para> You can use either a "
-"businesscard, a netinst or a full CD image (see <xref linkend=\"official-"
-"cdrom\"/>). Be sure to select one that fits. Note that the <quote>netboot "
-"<filename>mini.iso</filename></quote> image is not usable for this purpose. "
-"</para> </footnote> onto the stick. When you are done, unmount the USB "
-"memory stick (<userinput>umount /mnt</userinput>)."
+"netinst or a full CD image (see <xref linkend=\"official-cdrom\"/>). Be sure "
+"to select one that fits. Note that the <quote>netboot <filename>mini.iso</"
+"filename></quote> image is not usable for this purpose. </para> </footnote> "
+"onto the stick. When you are done, unmount the USB memory stick "
+"(<userinput>umount /mnt</userinput>)."
 msgstr ""
 "Если вы используете образ <filename>hd-media</filename>, то теперь должны "
 "скопировать файл ISO с образом &debian;<footnote> <para>Вы можете "
@@ -1220,7 +1245,7 @@ msgstr ""
 "размонтируйте карту памяти USB (<userinput>umount /mnt</userinput>)."
 
 #. Tag: para
-#: install-methods.xml:788
+#: install-methods.xml:810
 #, no-c-format
 msgid ""
 "Most USB sticks do not come pre-configured in such a way that Open Firmware "
@@ -1249,7 +1274,7 @@ msgstr ""
 "<classname>hfsutils</classname>."
 
 #. Tag: para
-#: install-methods.xml:805
+#: install-methods.xml:827
 #, no-c-format
 msgid ""
 "In order to start the kernel after booting from the USB stick, we will put a "
@@ -1266,7 +1291,7 @@ msgstr ""
 "поддерживает файловую систему HFS."
 
 #. Tag: para
-#: install-methods.xml:814
+#: install-methods.xml:836
 #, no-c-format
 msgid ""
 "The normal <command>ybin</command> tool that comes with <command>yaboot</"
@@ -1302,7 +1327,7 @@ msgstr ""
 "Unix."
 
 #. Tag: para
-#: install-methods.xml:835
+#: install-methods.xml:857
 #, no-c-format
 msgid ""
 "Mount the partition (<userinput>mount /dev/<replaceable>sdX2</replaceable> /"
@@ -1313,31 +1338,31 @@ msgstr ""
 "карту:"
 
 #. Tag: para
-#: install-methods.xml:842
+#: install-methods.xml:864
 #, no-c-format
 msgid "<filename>vmlinux</filename> (kernel binary)"
 msgstr "<filename>vmlinux</filename> (файл ядра)"
 
 #. Tag: para
-#: install-methods.xml:847
+#: install-methods.xml:869
 #, no-c-format
 msgid "<filename>initrd.gz</filename> (initial ramdisk image)"
 msgstr "<filename>initrd.gz</filename> (образ ramdisk)"
 
 #. Tag: para
-#: install-methods.xml:852
+#: install-methods.xml:874
 #, no-c-format
 msgid "<filename>yaboot.conf</filename> (yaboot configuration file)"
 msgstr "<filename>yaboot.conf</filename> (файл настройки yaboot)"
 
 #. Tag: para
-#: install-methods.xml:857
+#: install-methods.xml:879
 #, no-c-format
 msgid "<filename>boot.msg</filename> (optional boot message)"
 msgstr "<filename>boot.msg</filename> (необязательное загрузочное сообщение)"
 
 #. Tag: para
-#: install-methods.xml:864
+#: install-methods.xml:886
 #, no-c-format
 msgid ""
 "The <filename>yaboot.conf</filename> configuration file should contain the "
@@ -1372,13 +1397,13 @@ msgstr ""
 "образа."
 
 #. Tag: title
-#: install-methods.xml:902
+#: install-methods.xml:924
 #, no-c-format
 msgid "Preparing Files for Hard Disk Booting"
 msgstr "Подготовка файлов для загрузки с жёсткого диска"
 
 #. Tag: para
-#: install-methods.xml:903
+#: install-methods.xml:925
 #, no-c-format
 msgid ""
 "The installer may be booted using boot files placed on an existing hard "
@@ -1390,7 +1415,7 @@ msgstr ""
 "системы или вызовом системного загрузчика прямо из BIOS."
 
 #. Tag: para
-#: install-methods.xml:909
+#: install-methods.xml:931
 #, no-c-format
 msgid ""
 "A full, <quote>pure network</quote> installation can be achieved using this "
@@ -1403,7 +1428,7 @@ msgstr ""
 "например, поиск и прожиг CD образов или борьбы с кучей нечитаемых дискет."
 
 #. Tag: para
-#: install-methods.xml:916
+#: install-methods.xml:938
 #, no-c-format
 msgid ""
 "The installer cannot boot from files on an HFS+ file system. MacOS System "
@@ -1425,7 +1450,7 @@ msgstr ""
 "Linux, в особенности, для загрузки файлов установки."
 
 #. Tag: para
-#: install-methods.xml:927
+#: install-methods.xml:949
 #, no-c-format
 msgid ""
 "Different programs are used for hard disk installation system booting, "
@@ -1437,7 +1462,7 @@ msgstr ""
 "<quote>OldWorld</quote>."
 
 #. Tag: title
-#: install-methods.xml:936
+#: install-methods.xml:958
 #, no-c-format
 msgid ""
 "Hard disk installer booting using <command>LILO</command> or <command>GRUB</"
@@ -1447,7 +1472,7 @@ msgstr ""
 "command> или <command>GRUB</command>"
 
 #. Tag: para
-#: install-methods.xml:938
+#: install-methods.xml:960
 #, no-c-format
 msgid ""
 "This section explains how to add to or even replace an existing linux "
@@ -1457,7 +1482,7 @@ msgstr ""
 "linux с помощью <command>LILO</command> или <command>GRUB</command>."
 
 #. Tag: para
-#: install-methods.xml:944
+#: install-methods.xml:966
 #, no-c-format
 msgid ""
 "At boot time, both bootloaders support loading in memory not only the "
@@ -1469,7 +1494,7 @@ msgstr ""
 "качестве корневой файловой системы."
 
 #. Tag: para
-#: install-methods.xml:950
+#: install-methods.xml:972
 #, no-c-format
 msgid ""
 "Copy the following files from the &debian; archives to a convenient location "
@@ -1481,19 +1506,19 @@ msgstr ""
 "NTFS), например, в <filename>/boot/newinstall/</filename>."
 
 #. Tag: para
-#: install-methods.xml:958
+#: install-methods.xml:980
 #, no-c-format
 msgid "<filename>vmlinuz</filename> (kernel binary)"
 msgstr "<filename>vmlinuz</filename> (файл ядра)"
 
 #. Tag: para
-#: install-methods.xml:963
+#: install-methods.xml:985
 #, no-c-format
 msgid "<filename>initrd.gz</filename> (ramdisk image)"
 msgstr "<filename>initrd.gz</filename> (образ ramdisk)"
 
 #. Tag: para
-#: install-methods.xml:970
+#: install-methods.xml:992
 #, no-c-format
 msgid ""
 "Finally, to configure the bootloader proceed to <xref linkend=\"boot-initrd"
@@ -1503,7 +1528,7 @@ msgstr ""
 ">."
 
 #. Tag: title
-#: install-methods.xml:980
+#: install-methods.xml:1002
 #, no-c-format
 msgid "Hard disk installer booting using <command>loadlin</command>"
 msgstr ""
@@ -1511,7 +1536,7 @@ msgstr ""
 "command>"
 
 #. Tag: para
-#: install-methods.xml:981
+#: install-methods.xml:1003
 #, no-c-format
 msgid ""
 "This section explains how to prepare your hard drive for booting the "
@@ -1521,7 +1546,7 @@ msgstr ""
 "установки из DOS с помощью <command>loadlin</command>."
 
 #. Tag: para
-#: install-methods.xml:986
+#: install-methods.xml:1008
 #, no-c-format
 msgid ""
 "Copy the following directories from a &debian; CD image to <filename>c:\\</"
@@ -1531,26 +1556,26 @@ msgstr ""
 "filename>."
 
 #. Tag: para
-#: install-methods.xml:991
+#: install-methods.xml:1013
 #, no-c-format
 msgid ""
 "<filename>/&x86-install-dir;</filename> (kernel binary and ramdisk image)"
 msgstr "<filename>/&x86-install-dir;</filename> (файл ядра и образ ramdisk)"
 
 #. Tag: para
-#: install-methods.xml:996
+#: install-methods.xml:1018
 #, no-c-format
 msgid "<filename>/tools</filename> (loadlin tool)"
 msgstr "<filename>/tools</filename> (утилита loadlin)"
 
 #. Tag: title
-#: install-methods.xml:1009
+#: install-methods.xml:1031
 #, no-c-format
 msgid "Hard Disk Installer Booting for OldWorld Macs"
 msgstr "Загрузка программы установки с жёсткого диска для OldWorld Mac"
 
 #. Tag: para
-#: install-methods.xml:1010
+#: install-methods.xml:1032
 #, no-c-format
 msgid ""
 "The <filename>boot-floppy-hfs</filename> floppy uses <application>miBoot</"
@@ -1574,7 +1599,7 @@ msgstr ""
 "модели нужно использовать <application>BootX</application>."
 
 #. Tag: para
-#: install-methods.xml:1023
+#: install-methods.xml:1045
 #, no-c-format
 msgid ""
 "Download and unstuff the <application>BootX</application> distribution, "
@@ -1602,13 +1627,13 @@ msgstr ""
 "активный System Folder."
 
 #. Tag: title
-#: install-methods.xml:1043
+#: install-methods.xml:1065
 #, no-c-format
 msgid "Hard Disk Installer Booting for NewWorld Macs"
 msgstr "Загрузка программы установки с жёсткого диска для NewWorld Mac"
 
 #. Tag: para
-#: install-methods.xml:1044
+#: install-methods.xml:1066
 #, no-c-format
 msgid ""
 "NewWorld PowerMacs support booting from a network or an ISO9660 CD-ROM, as "
@@ -1629,7 +1654,7 @@ msgstr ""
 "использоваться на NewWorld PowerMac."
 
 #. Tag: para
-#: install-methods.xml:1055
+#: install-methods.xml:1077
 #, no-c-format
 msgid ""
 "<emphasis>Copy</emphasis> (not move) the following four files which you "
@@ -1643,31 +1668,31 @@ msgstr ""
 "перетаскивания каждого файла на значок жёсткого диска)."
 
 #. Tag: filename
-#: install-methods.xml:1065 install-methods.xml:1391
+#: install-methods.xml:1087 install-methods.xml:1413
 #, no-c-format
 msgid "vmlinux"
 msgstr "vmlinux"
 
 #. Tag: filename
-#: install-methods.xml:1070 install-methods.xml:1396
+#: install-methods.xml:1092 install-methods.xml:1418
 #, no-c-format
 msgid "initrd.gz"
 msgstr "initrd.gz"
 
 #. Tag: filename
-#: install-methods.xml:1075 install-methods.xml:1401
+#: install-methods.xml:1097 install-methods.xml:1423
 #, no-c-format
 msgid "yaboot"
 msgstr "yaboot"
 
 #. Tag: filename
-#: install-methods.xml:1080 install-methods.xml:1406
+#: install-methods.xml:1102 install-methods.xml:1428
 #, no-c-format
 msgid "yaboot.conf"
 msgstr "yaboot.conf"
 
 #. Tag: para
-#: install-methods.xml:1085
+#: install-methods.xml:1107
 #, no-c-format
 msgid ""
 "Make a note of the partition number of the MacOS partition where you place "
@@ -1683,7 +1708,7 @@ msgstr ""
 "установки."
 
 #. Tag: para
-#: install-methods.xml:1093
+#: install-methods.xml:1115
 #, no-c-format
 msgid "To boot the installer, proceed to <xref linkend=\"boot-newworld\"/>."
 msgstr ""
@@ -1691,13 +1716,13 @@ msgstr ""
 "newworld\"/>."
 
 #. Tag: title
-#: install-methods.xml:1106
+#: install-methods.xml:1128
 #, no-c-format
 msgid "Preparing Files for TFTP Net Booting"
 msgstr "Подготовка файлов для загрузки по TFTP"
 
 #. Tag: para
-#: install-methods.xml:1107
+#: install-methods.xml:1129
 #, no-c-format
 msgid ""
 "If your machine is connected to a local area network, you may be able to "
@@ -1712,7 +1737,7 @@ msgstr ""
 "поддержку загрузки вашей машины."
 
 #. Tag: para
-#: install-methods.xml:1115
+#: install-methods.xml:1137
 #, no-c-format
 msgid ""
 "You need to set up a TFTP server, and for many machines a DHCP server<phrase "
@@ -1724,7 +1749,7 @@ msgstr ""
 "\"supports-dhcp\"> или BOOTP сервер</phrase>."
 
 #. Tag: para
-#: install-methods.xml:1122
+#: install-methods.xml:1144
 #, no-c-format
 msgid ""
 "<phrase condition=\"supports-rarp\">The Reverse Address Resolution Protocol "
@@ -1745,7 +1770,7 @@ msgstr ""
 "через DHCP."
 
 #. Tag: para
-#: install-methods.xml:1136
+#: install-methods.xml:1158
 #, no-c-format
 msgid ""
 "For PowerPC, if you have a NewWorld Power Macintosh machine, it is a good "
@@ -1757,7 +1782,7 @@ msgstr ""
 "загрузить с помощью BOOTP."
 
 #. Tag: para
-#: install-methods.xml:1142
+#: install-methods.xml:1164
 #, no-c-format
 msgid ""
 "Some older HPPA machines (e.g. 715/75) use RBOOTD rather than BOOTP. There "
@@ -1767,7 +1792,7 @@ msgstr ""
 "BOOTP. Пакет <classname>rbootd</classname> доступен в &debian;."
 
 #. Tag: para
-#: install-methods.xml:1147
+#: install-methods.xml:1169
 #, no-c-format
 msgid ""
 "The Trivial File Transfer Protocol (TFTP) is used to serve the boot image to "
@@ -1782,7 +1807,7 @@ msgstr ""
 "Solaris) и GNU/Linux."
 
 #. Tag: para
-#: install-methods.xml:1155
+#: install-methods.xml:1177
 #, no-c-format
 msgid ""
 "For a &debian-gnu; server we recommend <classname>tftpd-hpa</classname>. "
@@ -1796,13 +1821,13 @@ msgstr ""
 "classname>."
 
 #. Tag: title
-#: install-methods.xml:1171
+#: install-methods.xml:1193
 #, no-c-format
 msgid "Setting up RARP server"
 msgstr "Настройка RARP сервера"
 
 #. Tag: para
-#: install-methods.xml:1172
+#: install-methods.xml:1194
 #, no-c-format
 msgid ""
 "To set up RARP, you need to know the Ethernet address (a.k.a. the MAC "
@@ -1822,7 +1847,7 @@ msgstr ""
 "ip addr show dev eth0</userinput>."
 
 #. Tag: para
-#: install-methods.xml:1184
+#: install-methods.xml:1206
 #, no-c-format
 msgid ""
 "On a RARP server system using a Linux 2.4 or 2.6 kernel, or Solaris/SunOS, "
@@ -1846,13 +1871,13 @@ msgstr ""
 "или <userinput>/usr/etc/rarpd -a</userinput> в SunOS 4 (Solaris 1)."
 
 #. Tag: title
-#: install-methods.xml:1205
+#: install-methods.xml:1227
 #, no-c-format
 msgid "Setting up a DHCP server"
 msgstr "Настройка DHCP сервера"
 
 #. Tag: para
-#: install-methods.xml:1206
+#: install-methods.xml:1228
 #, no-c-format
 msgid ""
 "One free software DHCP server is ISC <command>dhcpd</command>. For &debian-"
@@ -1866,7 +1891,7 @@ msgstr ""
 "filename>):"
 
 #. Tag: screen
-#: install-methods.xml:1213
+#: install-methods.xml:1235
 #, no-c-format
 msgid ""
 "option domain-name \"example.com\";\n"
@@ -1910,7 +1935,7 @@ msgstr ""
 "}"
 
 #. Tag: para
-#: install-methods.xml:1215
+#: install-methods.xml:1237
 #, no-c-format
 msgid ""
 "In this example, there is one server <replaceable>servername</replaceable> "
@@ -1927,7 +1952,7 @@ msgstr ""
 "содержать имя файла, который нужно получить по TFTP."
 
 #. Tag: para
-#: install-methods.xml:1225
+#: install-methods.xml:1247
 #, no-c-format
 msgid ""
 "After you have edited the <command>dhcpd</command> configuration file, "
@@ -1938,13 +1963,13 @@ msgstr ""
 "userinput>."
 
 #. Tag: title
-#: install-methods.xml:1233
+#: install-methods.xml:1255
 #, no-c-format
 msgid "Enabling PXE Booting in the DHCP configuration"
 msgstr "Включение загрузки PXE в конфигурацию DHCP"
 
 #. Tag: para
-#: install-methods.xml:1234
+#: install-methods.xml:1256
 #, no-c-format
 msgid ""
 "Here is another example for a <filename>dhcp.conf</filename> using the Pre-"
@@ -2015,13 +2040,13 @@ msgstr ""
 "(смотрите ниже <xref linkend=\"tftp-images\"/>)."
 
 #. Tag: title
-#: install-methods.xml:1254
+#: install-methods.xml:1276
 #, no-c-format
 msgid "Setting up a BOOTP server"
 msgstr "Настройка BOOTP сервера"
 
 #. Tag: para
-#: install-methods.xml:1255
+#: install-methods.xml:1277
 #, no-c-format
 msgid ""
 "There are two BOOTP servers available for GNU/Linux. The first is CMU "
@@ -2037,7 +2062,7 @@ msgstr ""
 "соответственно."
 
 #. Tag: para
-#: install-methods.xml:1263
+#: install-methods.xml:1285
 #, no-c-format
 msgid ""
 "To use CMU <command>bootpd</command>, you must first uncomment (or add) the "
@@ -2100,7 +2125,7 @@ msgstr ""
 "userinput> содержит MAC адрес машины.</phrase>"
 
 #. Tag: para
-#: install-methods.xml:1296
+#: install-methods.xml:1318
 #, no-c-format
 msgid ""
 "By contrast, setting up BOOTP with ISC <command>dhcpd</command> is really "
@@ -2124,13 +2149,13 @@ msgstr ""
 "restart</userinput>."
 
 #. Tag: title
-#: install-methods.xml:1315
+#: install-methods.xml:1337
 #, no-c-format
 msgid "Enabling the TFTP Server"
 msgstr "Включение TFTP сервера"
 
 #. Tag: para
-#: install-methods.xml:1316
+#: install-methods.xml:1338
 #, no-c-format
 msgid ""
 "To get the TFTP server ready to go, you should first make sure that "
@@ -2140,7 +2165,7 @@ msgstr ""
 "<command>tftpd</command>."
 
 #. Tag: para
-#: install-methods.xml:1321
+#: install-methods.xml:1343
 #, no-c-format
 msgid ""
 "In the case of <classname>tftpd-hpa</classname> there are two ways the "
@@ -2156,7 +2181,7 @@ msgstr ""
 "перенастройку пакета."
 
 #. Tag: para
-#: install-methods.xml:1330
+#: install-methods.xml:1352
 #, no-c-format
 msgid ""
 "Historically, TFTP servers used <filename>/tftpboot</filename> as directory "
@@ -2174,7 +2199,7 @@ msgstr ""
 "изменить примеры конфигурации для соответствия."
 
 #. Tag: para
-#: install-methods.xml:1340
+#: install-methods.xml:1362
 #, no-c-format
 msgid ""
 "All <command>in.tftpd</command> alternatives available in &debian; should "
@@ -2191,7 +2216,7 @@ msgstr ""
 "точка при поиске причин ошибок."
 
 #. Tag: para
-#: install-methods.xml:1348
+#: install-methods.xml:1370
 #, no-c-format
 msgid ""
 "If you intend to install &debian; on an SGI machine and your TFTP server is "
@@ -2221,13 +2246,13 @@ msgstr ""
 "используемого TFTP-сервером Linux."
 
 #. Tag: title
-#: install-methods.xml:1370
+#: install-methods.xml:1392
 #, no-c-format
 msgid "Move TFTP Images Into Place"
 msgstr "Копирование TFTP образов в каталог TFTP сервера"
 
 #. Tag: para
-#: install-methods.xml:1371
+#: install-methods.xml:1393
 #, no-c-format
 msgid ""
 "Next, place the TFTP boot image you need, as found in <xref linkend=\"where-"
@@ -2243,7 +2268,7 @@ msgstr ""
 "зависит от клиента TFTP и никак не стандартизовано."
 
 #. Tag: para
-#: install-methods.xml:1380
+#: install-methods.xml:1402
 #, no-c-format
 msgid ""
 "On NewWorld Power Macintosh machines, you will need to set up the "
@@ -2258,13 +2283,13 @@ msgstr ""
 "следующие файлы из каталога <filename>netboot/</filename>:"
 
 #. Tag: filename
-#: install-methods.xml:1411
+#: install-methods.xml:1433
 #, no-c-format
 msgid "boot.msg"
 msgstr "boot.msg"
 
 #. Tag: para
-#: install-methods.xml:1416
+#: install-methods.xml:1438
 #, no-c-format
 msgid ""
 "For PXE booting, everything you should need is set up in the "
@@ -2280,7 +2305,7 @@ msgstr ""
 "имени загружаемого файла."
 
 #. Tag: para
-#: install-methods.xml:1424
+#: install-methods.xml:1446
 #, no-c-format
 msgid ""
 "For PXE booting, everything you should need is set up in the "
@@ -2296,13 +2321,13 @@ msgstr ""
 "command> в качестве имени загружаемого файла."
 
 #. Tag: title
-#: install-methods.xml:1436
+#: install-methods.xml:1458
 #, no-c-format
 msgid "SPARC TFTP Booting"
 msgstr "Загрузка SPARC по TFTP"
 
 #. Tag: para
-#: install-methods.xml:1437
+#: install-methods.xml:1459
 #, no-c-format
 msgid ""
 "Some SPARC architectures add the subarchitecture names, such as "
@@ -2334,7 +2359,7 @@ msgstr ""
 "заглавными и если нужно, добавить имя субархитектуры."
 
 #. Tag: para
-#: install-methods.xml:1453
+#: install-methods.xml:1475
 #, no-c-format
 msgid ""
 "If you've done all this correctly, giving the command <userinput>boot net</"
@@ -2347,7 +2372,7 @@ msgstr ""
 "сообщения в логах сервера tftp, какое имя образа было запрошено."
 
 #. Tag: para
-#: install-methods.xml:1460
+#: install-methods.xml:1482
 #, no-c-format
 msgid ""
 "You can also force some sparc systems to look for a specific file name by "
@@ -2361,13 +2386,13 @@ msgstr ""
 "в котором его будет искать TFTP сервер."
 
 #. Tag: title
-#: install-methods.xml:1471
+#: install-methods.xml:1493
 #, no-c-format
 msgid "SGI TFTP Booting"
 msgstr "Загрузка SGI по TFTP"
 
 #. Tag: para
-#: install-methods.xml:1472
+#: install-methods.xml:1494
 #, no-c-format
 msgid ""
 "On SGI machines you can rely on the <command>bootpd</command> to supply the "
@@ -2381,13 +2406,13 @@ msgstr ""
 "<filename>/etc/dhcpd.conf</filename>."
 
 #. Tag: title
-#: install-methods.xml:1580
+#: install-methods.xml:1602
 #, no-c-format
 msgid "Automatic Installation"
 msgstr "Автоматическая установка"
 
 #. Tag: para
-#: install-methods.xml:1581
+#: install-methods.xml:1603
 #, no-c-format
 msgid ""
 "For installing on multiple computers it's possible to do fully automatic "
@@ -2403,13 +2428,13 @@ msgstr ""
 "fai-project.org\">домашней странице FAI</ulink>."
 
 #. Tag: title
-#: install-methods.xml:1593
+#: install-methods.xml:1615
 #, no-c-format
 msgid "Automatic Installation Using the &debian; Installer"
 msgstr "Автоматическая установка с помощью программы установки &debian;"
 
 #. Tag: para
-#: install-methods.xml:1594
+#: install-methods.xml:1616
 #, no-c-format
 msgid ""
 "The &debian; Installer supports automating installs via preconfiguration "
@@ -2423,7 +2448,7 @@ msgstr ""
 "вопросы, задаваемые во время процесса установки."
 
 #. Tag: para
-#: install-methods.xml:1601
+#: install-methods.xml:1623
 #, no-c-format
 msgid ""
 "Full documentation on preseeding including a working example that you can "
@@ -2433,40 +2458,6 @@ msgstr ""
 "можете отредактировать, находится в <xref linkend=\"appendix-preseed\"/>."
 
 #~ msgid ""
-#~ "As CDs have a rather limited capacity by today's standards, not all "
-#~ "graphical desktop environments are installable with only the first CD; "
-#~ "only XFCE (which is the default desktop environment installed by &debian-"
-#~ "gnu; &release;) completely fits on the first CD. For all other desktop "
-#~ "environments a CD installation requires either network connectivity "
-#~ "during the installation to download the remaining files or additional CDs."
-#~ msgstr ""
-#~ "При сегодняшних объёмах, на CD-диск можно не так много уместить, "
-#~ "например, не каждое окружение рабочего стола можно установить имея только "
-#~ "первый CD; только XFCE (является окружением рабочего стола, которое "
-#~ "устанавливается в &debian-gnu; &release; по умолчанию) полностью "
-#~ "умещается на первом CD. При установке всех остальных окружений рабочего "
-#~ "стола с CD требуется или подключение к сети, или дополнительные диски."
-
-#~| msgid "NSLU2 Installation Files"
-#~ msgid "LaCie NASes Installation Files"
-#~ msgstr "Файлы установки для серверов сетевого доступа LaCie"
-
-#~| msgid ""
-#~| "The installation files for plug computers (SheevaPlug, GuruPlug, etc) "
-#~| "and OpenRD devices consist of a kernel and initrd for U-Boot. You can "
-#~| "obtain these files from &kirkwood-marvell-firmware-img;."
-#~ msgid ""
-#~ "The installation files for LaCie NASes (Network Space v2, Network Space "
-#~ "Max v2, Internet Space v2, d2 Network v2, 2Big Network v2 and 5Big "
-#~ "Network v2) consist of a kernel and initrd for U-Boot. You can obtain "
-#~ "these files from &lacie-kirkwood-firmware-img;."
-#~ msgstr ""
-#~ "Файлы установки для серверов сетевого доступа LaCie (Network Space v2, "
-#~ "Network Space Max v2, Internet Space v2, d2 Network v2, 2Big Network v2 и "
-#~ "5Big Network v2) представляют собой ядро и initrd для U-Boot. Вы можете "
-#~ "получить эти файлы из &lacie-kirkwood-firmware-img;."
-
-#~ msgid ""
 #~ "A firmware image is provided for the Linksys NSLU2 which will "
 #~ "automatically boot <classname>debian-installer</classname>. This image "
 #~ "can be uploaded via the Linksys web frontend or with upslug2. This "