Refresh po|pot files after changings in en

1 files changed, 107 insertions, 81 deletions

diff --git a/po/ru/install-methods.po b/po/ru/install-methods.po
index e746adc89..828d49ac2 100644
--- a/po/ru/install-methods.po
+++ b/po/ru/install-methods.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: install-methods\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-09-22 23:04+0000\n"
+"POT-Creation-Date: 2020-04-02 09:22+0000\n"
 "PO-Revision-Date: 2018-10-21 10:01+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -774,14 +774,22 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:436
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "In order to start the kernel after booting from the USB stick, we will "
+#| "put a boot loader on the stick. Although any boot loader (e.g. "
+#| "<classname>lilo</classname>) should work, it's convenient to use "
+#| "<classname>syslinux</classname>, since it uses a FAT16 partition and can "
+#| "be reconfigured by just editing a text file. Any operating system which "
+#| "supports the FAT file system can be used to make changes to the "
+#| "configuration of the boot loader."
 msgid ""
 "In order to start the kernel after booting from the USB stick, we will put a "
-"boot loader on the stick. Although any boot loader (e.g. <classname>lilo</"
-"classname>) should work, it's convenient to use <classname>syslinux</"
-"classname>, since it uses a FAT16 partition and can be reconfigured by just "
-"editing a text file. Any operating system which supports the FAT file system "
-"can be used to make changes to the configuration of the boot loader."
+"boot loader on the stick. Although any boot loader should work, it's "
+"convenient to use <classname>syslinux</classname>, since it uses a FAT16 "
+"partition and can be reconfigured by just editing a text file. Any operating "
+"system which supports the FAT file system can be used to make changes to the "
+"configuration of the boot loader."
 msgstr ""
 "Для запуска ядра после загрузки с карты памяти USB, мы поместим на неё "
 "системный загрузчик. Хотя должен работать любой системный загрузчик "
@@ -1149,31 +1157,39 @@ msgstr ""
 
 #. Tag: title
 #: install-methods.xml:676
-#, no-c-format
-msgid ""
-"Hard disk installer booting from Linux using <command>LILO</command> or "
-"<command>GRUB</command>"
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Hard disk installer booting from DOS using <command>loadlin</command>"
+msgid "Hard disk installer booting from Linux using <command>GRUB</command>"
 msgstr ""
-"Загрузка программы установки с жёсткого диска из Linux с помощью "
-"<command>LILO</command> или <command>GRUB</command>"
+"Загрузка программы установки с жёсткого диска из DOS с помощью "
+"<command>loadlin</command>"
 
 #. Tag: para
 #: install-methods.xml:678
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "This section explains how to add to or even replace an existing linux "
+#| "installation using either <command>LILO</command> or <command>GRUB</"
+#| "command>."
 msgid ""
 "This section explains how to add to or even replace an existing linux "
-"installation using either <command>LILO</command> or <command>GRUB</command>."
+"installation using <command>GRUB</command>."
 msgstr ""
 "Этот раздел описывает как добавить или даже заменить существующую установку "
 "linux с помощью <command>LILO</command> или <command>GRUB</command>."
 
 #. Tag: para
 #: install-methods.xml:684
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "At boot time, both bootloaders support loading in memory not only the "
+#| "kernel, but also a disk image. This RAM disk can be used as the root file-"
+#| "system by the kernel."
 msgid ""
-"At boot time, both bootloaders support loading in memory not only the "
-"kernel, but also a disk image. This RAM disk can be used as the root file-"
-"system by the kernel."
+"At boot time, <command>GRUB</command> supports loading in memory not only "
+"the kernel, but also a disk image. This RAM disk can be used as the root "
+"file-system by the kernel."
 msgstr ""
 "Во время загрузки оба системных загрузчика способны загружать в память не "
 "только ядро, но и образ диска. Этот RAMdisk может использоваться ядром в "
@@ -1181,30 +1197,33 @@ msgstr ""
 
 #. Tag: para
 #: install-methods.xml:690
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Copy the following files from the &debian; archives to a convenient "
+#| "location on your hard drive (note that LILO can not boot from files on an "
+#| "NTFS file system), for instance to <filename>/boot/newinstall/</filename>."
 msgid ""
 "Copy the following files from the &debian; archives to a convenient location "
-"on your hard drive (note that LILO can not boot from files on an NTFS file "
-"system), for instance to <filename>/boot/newinstall/</filename>."
+"on your hard drive, for instance to <filename>/boot/newinstall/</filename>."
 msgstr ""
 "Скопируйте следующие файлы из архива &debian; в любое место на жёстком диске "
 "(заметим, что загрузчик LILO не способен загружать файлы из файловой системы "
 "NTFS), например, в <filename>/boot/newinstall/</filename>."
 
 #. Tag: para
-#: install-methods.xml:698
+#: install-methods.xml:697
 #, no-c-format
 msgid "<filename>vmlinuz</filename> (kernel binary)"
 msgstr "<filename>vmlinuz</filename> (файл ядра)"
 
 #. Tag: para
-#: install-methods.xml:703
+#: install-methods.xml:702
 #, no-c-format
 msgid "<filename>initrd.gz</filename> (ramdisk image)"
 msgstr "<filename>initrd.gz</filename> (образ ramdisk)"
 
 #. Tag: para
-#: install-methods.xml:710
+#: install-methods.xml:709
 #, no-c-format
 msgid ""
 "Finally, to configure the bootloader proceed to <xref linkend=\"boot-initrd"
@@ -1214,7 +1233,7 @@ msgstr ""
 ">."
 
 #. Tag: title
-#: install-methods.xml:720
+#: install-methods.xml:719
 #, no-c-format
 msgid "Hard disk installer booting from DOS using <command>loadlin</command>"
 msgstr ""
@@ -1222,7 +1241,7 @@ msgstr ""
 "<command>loadlin</command>"
 
 #. Tag: para
-#: install-methods.xml:721
+#: install-methods.xml:720
 #, no-c-format
 msgid ""
 "This section explains how to prepare your hard drive for booting the "
@@ -1232,7 +1251,7 @@ msgstr ""
 "установки из DOS с помощью <command>loadlin</command>."
 
 #. Tag: para
-#: install-methods.xml:726
+#: install-methods.xml:725
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Copy the following directories from a &debian; CD image to <filename>c:"
@@ -1245,26 +1264,26 @@ msgstr ""
 "filename>."
 
 #. Tag: para
-#: install-methods.xml:731
+#: install-methods.xml:730
 #, 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:736
+#: install-methods.xml:735
 #, no-c-format
 msgid "<filename>/tools</filename> (loadlin tool)"
 msgstr "<filename>/tools</filename> (утилита loadlin)"
 
 #. Tag: title
-#: install-methods.xml:848
+#: install-methods.xml:847
 #, no-c-format
 msgid "Preparing Files for TFTP Net Booting"
 msgstr "Подготовка файлов для загрузки по TFTP"
 
 #. Tag: para
-#: install-methods.xml:849
+#: install-methods.xml:848
 #, no-c-format
 msgid ""
 "If your machine is connected to a local area network, you may be able to "
@@ -1279,7 +1298,7 @@ msgstr ""
 "поддержку загрузки вашей машины."
 
 #. Tag: para
-#: install-methods.xml:857
+#: install-methods.xml:856
 #, no-c-format
 msgid ""
 "You need to set up a TFTP server, and for many machines a DHCP server<phrase "
@@ -1291,7 +1310,7 @@ msgstr ""
 "\"supports-dhcp\"> или BOOTP сервер</phrase>."
 
 #. Tag: para
-#: install-methods.xml:864
+#: install-methods.xml:863
 #, no-c-format
 msgid ""
 "<phrase condition=\"supports-rarp\">The Reverse Address Resolution Protocol "
@@ -1312,7 +1331,7 @@ msgstr ""
 "через DHCP."
 
 #. Tag: para
-#: install-methods.xml:878
+#: install-methods.xml:877
 #, no-c-format
 msgid ""
 "For PowerPC, if you have a NewWorld Power Macintosh machine, it is a good "
@@ -1324,7 +1343,7 @@ msgstr ""
 "загрузить с помощью BOOTP."
 
 #. Tag: para
-#: install-methods.xml:884
+#: install-methods.xml:883
 #, no-c-format
 msgid ""
 "Some older HPPA machines (e.g. 715/75) use RBOOTD rather than BOOTP. There "
@@ -1334,7 +1353,7 @@ msgstr ""
 "BOOTP. Пакет <classname>rbootd</classname> доступен в &debian;."
 
 #. Tag: para
-#: install-methods.xml:889
+#: install-methods.xml:888
 #, no-c-format
 msgid ""
 "The Trivial File Transfer Protocol (TFTP) is used to serve the boot image to "
@@ -1349,7 +1368,7 @@ msgstr ""
 "Solaris) и GNU/Linux."
 
 #. Tag: para
-#: install-methods.xml:897
+#: install-methods.xml:896
 #, no-c-format
 msgid ""
 "For a &debian-gnu; server we recommend <classname>tftpd-hpa</classname>. "
@@ -1363,13 +1382,13 @@ msgstr ""
 "classname>."
 
 #. Tag: title
-#: install-methods.xml:913
+#: install-methods.xml:912
 #, no-c-format
 msgid "Setting up RARP server"
 msgstr "Настройка RARP сервера"
 
 #. Tag: para
-#: install-methods.xml:914
+#: install-methods.xml:913
 #, fuzzy, no-c-format
 #| msgid ""
 #| "To set up RARP, you need to know the Ethernet address (a.k.a. the MAC "
@@ -1396,7 +1415,7 @@ msgstr ""
 "ip addr show dev eth0</userinput>."
 
 #. Tag: para
-#: install-methods.xml:926
+#: install-methods.xml:925
 #, no-c-format
 msgid ""
 "On a RARP server system using a Linux kernel or Solaris/SunOS, you use the "
@@ -1420,13 +1439,13 @@ msgstr ""
 "или <userinput>/usr/etc/rarpd -a</userinput> в SunOS 4 (Solaris 1)."
 
 #. Tag: title
-#: install-methods.xml:947
+#: install-methods.xml:946
 #, no-c-format
 msgid "Setting up a DHCP server"
 msgstr "Настройка DHCP сервера"
 
 #. Tag: para
-#: install-methods.xml:948
+#: install-methods.xml:947
 #, no-c-format
 msgid ""
 "One free software DHCP server is ISC <command>dhcpd</command>. For &debian-"
@@ -1440,7 +1459,7 @@ msgstr ""
 "conf</filename>):"
 
 #. Tag: screen
-#: install-methods.xml:955
+#: install-methods.xml:954
 #, no-c-format
 msgid ""
 "option domain-name \"example.com\";\n"
@@ -1484,7 +1503,7 @@ msgstr ""
 "}"
 
 #. Tag: para
-#: install-methods.xml:957
+#: install-methods.xml:956
 #, no-c-format
 msgid ""
 "In this example, there is one server <replaceable>servername</replaceable> "
@@ -1501,7 +1520,7 @@ msgstr ""
 "содержать имя файла, который нужно получить по TFTP."
 
 #. Tag: para
-#: install-methods.xml:967
+#: install-methods.xml:966
 #, no-c-format
 msgid ""
 "After you have edited the <command>dhcpd</command> configuration file, "
@@ -1512,13 +1531,13 @@ msgstr ""
 "restart</userinput>."
 
 #. Tag: title
-#: install-methods.xml:975
+#: install-methods.xml:974
 #, no-c-format
 msgid "Enabling PXE Booting in the DHCP configuration"
 msgstr "Включение загрузки PXE в конфигурацию DHCP"
 
 #. Tag: para
-#: install-methods.xml:976
+#: install-methods.xml:975
 #, no-c-format
 msgid ""
 "Here is another example for a <filename>dhcp.conf</filename> using the Pre-"
@@ -1589,7 +1608,7 @@ msgstr ""
 "(смотрите ниже <xref linkend=\"tftp-images\"/>)."
 
 #. Tag: para
-#: install-methods.xml:986
+#: install-methods.xml:985
 #, no-c-format
 msgid ""
 "If your machine uses UEFI to boot, you will have to specify a boot loader "
@@ -1597,7 +1616,7 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: install-methods.xml:990
+#: install-methods.xml:989
 #, no-c-format
 msgid ""
 "group {\n"
@@ -1611,13 +1630,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: install-methods.xml:1003
+#: install-methods.xml:1002
 #, no-c-format
 msgid "Setting up a BOOTP server"
 msgstr "Настройка BOOTP сервера"
 
 #. Tag: para
-#: install-methods.xml:1004
+#: install-methods.xml:1003
 #, no-c-format
 msgid ""
 "There are two BOOTP servers available for GNU/Linux. The first is CMU "
@@ -1633,7 +1652,7 @@ msgstr ""
 "соответственно."
 
 #. Tag: para
-#: install-methods.xml:1012
+#: install-methods.xml:1011
 #, no-c-format
 msgid ""
 "To use CMU <command>bootpd</command>, you must first uncomment (or add) the "
@@ -1696,7 +1715,7 @@ msgstr ""
 "userinput> содержит MAC адрес машины.</phrase>"
 
 #. Tag: para
-#: install-methods.xml:1045
+#: install-methods.xml:1044
 #, no-c-format
 msgid ""
 "By contrast, setting up BOOTP with ISC <command>dhcpd</command> is really "
@@ -1720,13 +1739,13 @@ msgstr ""
 "restart</userinput>."
 
 #. Tag: title
-#: install-methods.xml:1064
+#: install-methods.xml:1063
 #, no-c-format
 msgid "Enabling the TFTP Server"
 msgstr "Включение TFTP сервера"
 
 #. Tag: para
-#: install-methods.xml:1065
+#: install-methods.xml:1064
 #, no-c-format
 msgid ""
 "To get the TFTP server ready to go, you should first make sure that "
@@ -1736,7 +1755,7 @@ msgstr ""
 "<command>tftpd</command>."
 
 #. Tag: para
-#: install-methods.xml:1070
+#: install-methods.xml:1069
 #, no-c-format
 msgid ""
 "In the case of <classname>tftpd-hpa</classname> there are two ways the "
@@ -1752,7 +1771,7 @@ msgstr ""
 "перенастройку пакета."
 
 #. Tag: para
-#: install-methods.xml:1079
+#: install-methods.xml:1078
 #, no-c-format
 msgid ""
 "Historically, TFTP servers used <filename>/tftpboot</filename> as directory "
@@ -1770,7 +1789,7 @@ msgstr ""
 "изменить примеры конфигурации для соответствия."
 
 #. Tag: para
-#: install-methods.xml:1089
+#: install-methods.xml:1088
 #, no-c-format
 msgid ""
 "All <command>in.tftpd</command> alternatives available in &debian; should "
@@ -1787,7 +1806,7 @@ msgstr ""
 "точка при поиске причин ошибок."
 
 #. Tag: para
-#: install-methods.xml:1097
+#: install-methods.xml:1096
 #, no-c-format
 msgid ""
 "If you intend to install &debian; on an SGI machine and your TFTP server is "
@@ -1817,13 +1836,13 @@ msgstr ""
 "используемого TFTP-сервером Linux."
 
 #. Tag: title
-#: install-methods.xml:1119
+#: install-methods.xml:1118
 #, no-c-format
 msgid "Move TFTP Images Into Place"
 msgstr "Копирование TFTP образов в каталог TFTP сервера"
 
 #. Tag: para
-#: install-methods.xml:1120
+#: install-methods.xml:1119
 #, no-c-format
 msgid ""
 "Next, place the TFTP boot image you need, as found in <xref linkend=\"where-"
@@ -1839,7 +1858,7 @@ msgstr ""
 "зависит от клиента TFTP и никак не стандартизовано."
 
 #. Tag: para
-#: install-methods.xml:1129
+#: install-methods.xml:1128
 #, no-c-format
 msgid ""
 "On NewWorld Power Macintosh machines, you will need to set up the "
@@ -1854,37 +1873,37 @@ msgstr ""
 "следующие файлы из каталога <filename>netboot/</filename>:"
 
 #. Tag: filename
-#: install-methods.xml:1140
+#: install-methods.xml:1139
 #, no-c-format
 msgid "vmlinux"
 msgstr "vmlinux"
 
 #. Tag: filename
-#: install-methods.xml:1145
+#: install-methods.xml:1144
 #, no-c-format
 msgid "initrd.gz"
 msgstr "initrd.gz"
 
 #. Tag: filename
-#: install-methods.xml:1150
+#: install-methods.xml:1149
 #, no-c-format
 msgid "yaboot"
 msgstr "yaboot"
 
 #. Tag: filename
-#: install-methods.xml:1155
+#: install-methods.xml:1154
 #, no-c-format
 msgid "yaboot.conf"
 msgstr "yaboot.conf"
 
 #. Tag: filename
-#: install-methods.xml:1160
+#: install-methods.xml:1159
 #, no-c-format
 msgid "boot.msg"
 msgstr "boot.msg"
 
 #. Tag: para
-#: install-methods.xml:1165
+#: install-methods.xml:1164
 #, fuzzy, no-c-format
 #| msgid ""
 #| "For PXE booting, everything you should need is set up in the "
@@ -1908,7 +1927,7 @@ msgstr ""
 "имени загружаемого файла."
 
 #. Tag: para
-#: install-methods.xml:1175
+#: install-methods.xml:1174
 #, no-c-format
 msgid ""
 "For PXE booting, everything you should need is set up in the "
@@ -1924,13 +1943,13 @@ msgstr ""
 "command> в качестве имени загружаемого файла."
 
 #. Tag: title
-#: install-methods.xml:1187
+#: install-methods.xml:1186
 #, no-c-format
 msgid "SPARC TFTP Booting"
 msgstr "Загрузка SPARC по TFTP"
 
 #. Tag: para
-#: install-methods.xml:1188
+#: install-methods.xml:1187
 #, no-c-format
 msgid ""
 "Some SPARC architectures add the subarchitecture names, such as "
@@ -1962,7 +1981,7 @@ msgstr ""
 "заглавными и если нужно, добавить имя субархитектуры."
 
 #. Tag: para
-#: install-methods.xml:1204
+#: install-methods.xml:1203
 #, no-c-format
 msgid ""
 "If you've done all this correctly, giving the command <userinput>boot net</"
@@ -1975,7 +1994,7 @@ msgstr ""
 "сообщения в логах сервера tftp, какое имя образа было запрошено."
 
 #. Tag: para
-#: install-methods.xml:1211
+#: install-methods.xml:1210
 #, no-c-format
 msgid ""
 "You can also force some sparc systems to look for a specific file name by "
@@ -1989,13 +2008,13 @@ msgstr ""
 "в котором его будет искать TFTP сервер."
 
 #. Tag: title
-#: install-methods.xml:1222
+#: install-methods.xml:1221
 #, no-c-format
 msgid "SGI TFTP Booting"
 msgstr "Загрузка SGI по TFTP"
 
 #. Tag: para
-#: install-methods.xml:1223
+#: install-methods.xml:1222
 #, no-c-format
 msgid ""
 "On SGI machines you can rely on the <command>bootpd</command> to supply the "
@@ -2009,13 +2028,13 @@ msgstr ""
 "<filename>/etc/dhcpd.conf</filename>."
 
 #. Tag: title
-#: install-methods.xml:1331
+#: install-methods.xml:1330
 #, no-c-format
 msgid "Automatic Installation"
 msgstr "Автоматическая установка"
 
 #. Tag: para
-#: install-methods.xml:1332
+#: install-methods.xml:1331
 #, no-c-format
 msgid ""
 "For installing on multiple computers it's possible to do fully automatic "
@@ -2031,13 +2050,13 @@ msgstr ""
 "fai-project.org\">домашней странице FAI</ulink>."
 
 #. Tag: title
-#: install-methods.xml:1344
+#: install-methods.xml:1343
 #, no-c-format
 msgid "Automatic Installation Using the &debian; Installer"
 msgstr "Автоматическая установка с помощью программы установки &debian;"
 
 #. Tag: para
-#: install-methods.xml:1345
+#: install-methods.xml:1344
 #, no-c-format
 msgid ""
 "The &debian; Installer supports automating installs via preconfiguration "
@@ -2051,7 +2070,7 @@ msgstr ""
 "вопросы, задаваемые во время процесса установки."
 
 #. Tag: para
-#: install-methods.xml:1352
+#: install-methods.xml:1351
 #, no-c-format
 msgid ""
 "Full documentation on preseeding including a working example that you can "
@@ -2060,6 +2079,13 @@ msgstr ""
 "Полную документацию по автоматической установке и рабочий пример, который вы "
 "можете отредактировать, находится в <xref linkend=\"appendix-preseed\"/>."
 
+#~ msgid ""
+#~ "Hard disk installer booting from Linux using <command>LILO</command> or "
+#~ "<command>GRUB</command>"
+#~ msgstr ""
+#~ "Загрузка программы установки с жёсткого диска из Linux с помощью "
+#~ "<command>LILO</command> или <command>GRUB</command>"
+
 #~ msgid "Creating Floppies from Disk Images"
 #~ msgstr "Создание дискет из образов дисков"