Remove 'Laptop' entry from table 'Disk Space Needed for Tasks' (there is no such task option in the installer anymore)

1 files changed, 131 insertions, 143 deletions

diff --git a/po/ru/random-bits.po b/po/ru/random-bits.po
index 6342fb0e4..728a479c1 100644
--- a/po/ru/random-bits.po
+++ b/po/ru/random-bits.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: random-bits\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2018-10-21 10:09+0000\n"
+"POT-Creation-Date: 2018-11-09 16:26+0000\n"
 "PO-Revision-Date: 2018-11-02 21:16+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -618,101 +618,77 @@ msgstr "&task-desktop-cinnamon-tot;"
 #. Tag: entry
 #: random-bits.xml:271
 #, no-c-format
-msgid "Laptop"
-msgstr "Для ноутбука"
-
-#. Tag: entry
-#: random-bits.xml:272
-#, no-c-format
-msgid "&task-laptop-inst;"
-msgstr "&task-laptop-inst;"
-
-#. Tag: entry
-#: random-bits.xml:273
-#, no-c-format
-msgid "&task-laptop-dl;"
-msgstr "&task-laptop-dl;"
-
-#. Tag: entry
-#: random-bits.xml:274
-#, no-c-format
-msgid "&task-laptop-tot;"
-msgstr "&task-laptop-tot;"
-
-#. Tag: entry
-#: random-bits.xml:278
-#, no-c-format
 msgid "Web server"
 msgstr "веб сервер"
 
 #. Tag: entry
-#: random-bits.xml:279
+#: random-bits.xml:272
 #, no-c-format
 msgid "&task-web-inst;"
 msgstr "&task-web-inst;"
 
 #. Tag: entry
-#: random-bits.xml:280
+#: random-bits.xml:273
 #, no-c-format
 msgid "&task-web-dl;"
 msgstr "&task-web-dl;"
 
 #. Tag: entry
-#: random-bits.xml:281
+#: random-bits.xml:274
 #, no-c-format
 msgid "&task-web-tot;"
 msgstr "&task-web-tot;"
 
 #. Tag: entry
-#: random-bits.xml:285
+#: random-bits.xml:278
 #, no-c-format
 msgid "Print server"
 msgstr "сервер печати"
 
 #. Tag: entry
-#: random-bits.xml:286
+#: random-bits.xml:279
 #, no-c-format
 msgid "&task-print-inst;"
 msgstr "&task-print-inst;"
 
 #. Tag: entry
-#: random-bits.xml:287
+#: random-bits.xml:280
 #, no-c-format
 msgid "&task-print-dl;"
 msgstr "&task-print-dl;"
 
 #. Tag: entry
-#: random-bits.xml:288
+#: random-bits.xml:281
 #, no-c-format
 msgid "&task-print-tot;"
 msgstr "&task-print-tot;"
 
 #. Tag: entry
-#: random-bits.xml:292
+#: random-bits.xml:285
 #, no-c-format
 msgid "SSH server"
 msgstr "SSH-сервер"
 
 #. Tag: entry
-#: random-bits.xml:293
+#: random-bits.xml:286
 #, no-c-format
 msgid "&task-ssh-inst;"
 msgstr "&task-ssh-inst;"
 
 #. Tag: entry
-#: random-bits.xml:294
+#: random-bits.xml:287
 #, no-c-format
 msgid "&task-ssh-dl;"
 msgstr "&task-ssh-dl;"
 
 #. Tag: entry
-#: random-bits.xml:295
+#: random-bits.xml:288
 #, no-c-format
 msgid "&task-ssh-tot;"
 msgstr "&task-ssh-tot;"
 
 #. Tag: para
-#: random-bits.xml:301
+#: random-bits.xml:294
 #, no-c-format
 msgid ""
 "If you install in a language other than English, <command>tasksel</command> "
@@ -726,13 +702,13 @@ msgstr ""
 "зависит от языка; добавьте около 350 МБ на загрузку и установку."
 
 #. Tag: title
-#: random-bits.xml:316
+#: random-bits.xml:309
 #, no-c-format
 msgid "Installing &debian-gnu; from a Unix/Linux System"
 msgstr "Установка &debian-gnu; из системы Unix/Linux"
 
 #. Tag: para
-#: random-bits.xml:318
+#: random-bits.xml:311
 #, no-c-format
 msgid ""
 "This section explains how to install &debian-gnu; from an existing Unix or "
@@ -755,7 +731,7 @@ msgstr ""
 "относится к команде, вводимой в &debian; chroot."
 
 #. Tag: para
-#: random-bits.xml:330
+#: random-bits.xml:323
 #, no-c-format
 msgid ""
 "Once you've got the new &debian; system configured to your preference, you "
@@ -772,7 +748,7 @@ msgstr ""
 "загрузочными или установочными носителями."
 
 #. Tag: para
-#: random-bits.xml:341
+#: random-bits.xml:334
 #, no-c-format
 msgid ""
 "As this is a mostly manual procedure, you should bear in mind that you will "
@@ -793,13 +769,13 @@ msgstr ""
 "системы. Может потребоваться дополнительная установка и/или настройка."
 
 #. Tag: title
-#: random-bits.xml:355
+#: random-bits.xml:348
 #, no-c-format
 msgid "Getting Started"
 msgstr "Начинаем"
 
 #. Tag: para
-#: random-bits.xml:356
+#: random-bits.xml:349
 #, no-c-format
 msgid ""
 "With your current *nix partitioning tools, repartition the hard drive as "
@@ -816,7 +792,7 @@ msgstr ""
 "рабочего стола типа GNOME или KDE Plasma)."
 
 #. Tag: para
-#: random-bits.xml:364
+#: random-bits.xml:357
 #, no-c-format
 msgid ""
 "Next, create file systems on the partitions. For example, to create an ext3 "
@@ -834,7 +810,7 @@ msgstr ""
 "указывайте параметр <userinput>-j</userinput>."
 
 #. Tag: para
-#: random-bits.xml:374
+#: random-bits.xml:367
 #, no-c-format
 msgid ""
 "Initialize and activate swap (substitute the partition number for your "
@@ -858,7 +834,7 @@ msgstr ""
 "абсолютно произвольное."
 
 #. Tag: screen
-#: random-bits.xml:386
+#: random-bits.xml:379
 #, no-c-format
 msgid ""
 "# mkdir /mnt/debinst\n"
@@ -868,7 +844,7 @@ msgstr ""
 "# mount /dev/<replaceable>sda6</replaceable> /mnt/debinst"
 
 #. Tag: para
-#: random-bits.xml:389
+#: random-bits.xml:382
 #, no-c-format
 msgid ""
 "If you want to have parts of the filesystem (e.g. /usr) mounted on separate "
@@ -880,13 +856,13 @@ msgstr ""
 "перед тем как перейти к следующему этапу."
 
 #. Tag: title
-#: random-bits.xml:399
+#: random-bits.xml:392
 #, no-c-format
 msgid "Install <command>debootstrap</command>"
 msgstr "Установка <command>debootstrap</command>"
 
 #. Tag: para
-#: random-bits.xml:400
+#: random-bits.xml:393
 #, no-c-format
 msgid ""
 "The utility used by the &debian; installer, and recognized as the official "
@@ -911,7 +887,7 @@ msgstr ""
 "command>."
 
 #. Tag: para
-#: random-bits.xml:430
+#: random-bits.xml:423
 #, no-c-format
 msgid ""
 "Or, you can use the following procedure to install it manually. Make a work "
@@ -938,7 +914,7 @@ msgstr ""
 "(root)."
 
 #. Tag: screen
-#: random-bits.xml:445
+#: random-bits.xml:438
 #, no-c-format
 msgid ""
 "# ar -x debootstrap_0.X.X_all.deb\n"
@@ -950,13 +926,13 @@ msgstr ""
 "# zcat /full-path-to-work/work/data.tar.gz | tar xv"
 
 #. Tag: title
-#: random-bits.xml:451
+#: random-bits.xml:444
 #, no-c-format
 msgid "Run <command>debootstrap</command>"
 msgstr "Запуск <command>debootstrap</command>"
 
 #. Tag: para
-#: random-bits.xml:452
+#: random-bits.xml:445
 #, no-c-format
 msgid ""
 "<command>debootstrap</command> can download the needed files directly from "
@@ -972,7 +948,7 @@ msgstr ""
 "url=\"http://www.debian.org/mirror/list\"></ulink>."
 
 #. Tag: para
-#: random-bits.xml:461
+#: random-bits.xml:454
 #, no-c-format
 msgid ""
 "If you have a &releasename; &debian-gnu; CD mounted at <filename>/cdrom</"
@@ -984,7 +960,7 @@ msgstr ""
 "URL: <userinput>file:/cdrom/debian/</userinput>"
 
 #. Tag: para
-#: random-bits.xml:467
+#: random-bits.xml:460
 #, no-c-format
 msgid ""
 "Substitute one of the following for <replaceable>ARCH</replaceable> in the "
@@ -1012,13 +988,13 @@ msgstr ""
 "архитектуры узла, то добавьте параметр <userinput>--foreign</userinput>."
 
 #. Tag: title
-#: random-bits.xml:493
+#: random-bits.xml:486
 #, no-c-format
 msgid "Configure The Base System"
 msgstr "Настройка базовой системы"
 
 #. Tag: para
-#: random-bits.xml:494
+#: random-bits.xml:487
 #, no-c-format
 msgid ""
 "Now you've got a real &debian; system, though rather lean, on disk. "
@@ -1041,9 +1017,9 @@ msgstr ""
 "возможностями. Выполните <command>chroot</command> в неё: "
 "<informalexample><screen>\n"
 "# LANG=C.UTF-8 chroot /mnt/debinst /bin/bash\n"
-"</screen></informalexample> Если целевая "
-"архитектура отличается от архитектуры узла, то сначала вам нужно скопировать "
-"на узел qemu-user-static: <informalexample><screen>\n"
+"</screen></informalexample> Если целевая архитектура отличается от "
+"архитектуры узла, то сначала вам нужно скопировать на узел qemu-user-static: "
+"<informalexample><screen>\n"
 "# cp /usr/bin/qemu-ARCH-static /mnt/debinst/usr/bin\n"
 "# LANG=C.UTF-8 chroot /mnt/debinst qemu-ARCH-static /bin/bash\n"
 "</screen></informalexample>После выполнения chroot, вам может потребоваться "
@@ -1055,7 +1031,7 @@ msgstr ""
 "поддержки терминала."
 
 #. Tag: para
-#: random-bits.xml:514
+#: random-bits.xml:507
 #, no-c-format
 msgid ""
 "If the target architecture is different from the host, you need to finish "
@@ -1065,19 +1041,19 @@ msgstr ""
 "многоступенчатую начальную загрузку:"
 
 #. Tag: screen
-#: random-bits.xml:518
+#: random-bits.xml:511
 #, no-c-format
 msgid "/debootstrap/debootstrap --second-stage"
 msgstr "/debootstrap/debootstrap --second-stage"
 
 #. Tag: title
-#: random-bits.xml:523
+#: random-bits.xml:516
 #, no-c-format
 msgid "Create device files"
 msgstr "Создание файлов устройств"
 
 #. Tag: para
-#: random-bits.xml:524
+#: random-bits.xml:517
 #, no-c-format
 msgid ""
 "At this point <filename>/dev/</filename> only contains very basic device "
@@ -1097,13 +1073,13 @@ msgstr ""
 "статические файлы устройств."
 
 #. Tag: para
-#: random-bits.xml:534
+#: random-bits.xml:527
 #, no-c-format
 msgid "A few of the available options are:"
 msgstr "Некоторые доступные способы:"
 
 #. Tag: para
-#: random-bits.xml:539
+#: random-bits.xml:532
 #, no-c-format
 msgid ""
 "install the makedev package, and create a default set of static device files "
@@ -1113,7 +1089,7 @@ msgstr ""
 "статических файлов устройств (после выполнения chroot)"
 
 #. Tag: screen
-#: random-bits.xml:543
+#: random-bits.xml:536
 #, no-c-format
 msgid ""
 "# apt install makedev\n"
@@ -1127,7 +1103,7 @@ msgstr ""
 "# MAKEDEV generic"
 
 #. Tag: para
-#: random-bits.xml:546
+#: random-bits.xml:539
 #, no-c-format
 msgid ""
 "manually create only specific device files using <command>MAKEDEV</command>"
@@ -1136,7 +1112,7 @@ msgstr ""
 "<command>MAKEDEV</command>"
 
 #. Tag: para
-#: random-bits.xml:551
+#: random-bits.xml:544
 #, no-c-format
 msgid ""
 "bind mount /dev from your host system on top of /dev in the target system; "
@@ -1149,13 +1125,13 @@ msgstr ""
 "использовать осторожно"
 
 #. Tag: title
-#: random-bits.xml:564
+#: random-bits.xml:557
 #, no-c-format
 msgid "Mount Partitions"
 msgstr "Монтирование разделов"
 
 #. Tag: para
-#: random-bits.xml:565
+#: random-bits.xml:558
 #, no-c-format
 msgid ""
 "You need to create <filename>/etc/fstab</filename>. "
@@ -1238,13 +1214,13 @@ msgstr ""
 "тем как продолжить, убедитесь, что proc смонтирована:"
 
 #. Tag: screen
-#: random-bits.xml:591
+#: random-bits.xml:584
 #, no-c-format
 msgid "# mount -t proc proc /proc"
 msgstr "# mount -t proc proc /proc"
 
 #. Tag: para
-#: random-bits.xml:593
+#: random-bits.xml:586
 #, no-c-format
 msgid ""
 "The command <userinput>ls /proc</userinput> should now show a non-empty "
@@ -1256,19 +1232,19 @@ msgstr ""
 "chroot:"
 
 #. Tag: screen
-#: random-bits.xml:599
+#: random-bits.xml:592
 #, no-c-format
 msgid "# mount -t proc proc /mnt/debinst/proc"
 msgstr "# mount -t proc proc /mnt/debinst/proc"
 
 #. Tag: title
-#: random-bits.xml:605
+#: random-bits.xml:598
 #, no-c-format
 msgid "Setting Timezone"
 msgstr "Настройка часового пояса"
 
 #. Tag: para
-#: random-bits.xml:606
+#: random-bits.xml:599
 #, no-c-format
 msgid ""
 "Setting the third line of the file <filename>/etc/adjtime</filename> to "
@@ -1296,19 +1272,19 @@ msgstr ""
 "</screen></informalexample> Следующая команда позволяет указать часовой пояс."
 
 #. Tag: screen
-#: random-bits.xml:620
+#: random-bits.xml:613
 #, no-c-format
 msgid "# dpkg-reconfigure tzdata"
 msgstr "# dpkg-reconfigure tzdata"
 
 #. Tag: title
-#: random-bits.xml:626
+#: random-bits.xml:619
 #, no-c-format
 msgid "Configure Networking"
 msgstr "Настройка сети"
 
 #. Tag: para
-#: random-bits.xml:627
+#: random-bits.xml:620
 #, no-c-format
 msgid ""
 "To configure networking, edit <filename>/etc/network/interfaces</filename>, "
@@ -1433,13 +1409,13 @@ msgstr ""
 "интерфейса (eth0, eth1 и т.д.) как вы и ожидали."
 
 #. Tag: title
-#: random-bits.xml:668
+#: random-bits.xml:661
 #, no-c-format
 msgid "Configure Apt"
 msgstr "Настройка Apt"
 
 #. Tag: para
-#: random-bits.xml:669
+#: random-bits.xml:662
 #, no-c-format
 msgid ""
 "Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
@@ -1465,13 +1441,13 @@ msgstr ""
 "userinput> после изменения списка источников."
 
 #. Tag: title
-#: random-bits.xml:685
+#: random-bits.xml:678
 #, no-c-format
 msgid "Configure Locales and Keyboard"
 msgstr "Настройка раскладки клавиатуры и локалей"
 
 #. Tag: para
-#: random-bits.xml:686
+#: random-bits.xml:679
 #, no-c-format
 msgid ""
 "To configure your locale settings to use a language other than English, "
@@ -1491,7 +1467,7 @@ msgstr ""
 "</screen></informalexample> Для настройки раскладки клавиатуры (если нужно):"
 
 #. Tag: screen
-#: random-bits.xml:696
+#: random-bits.xml:689
 #, no-c-format
 msgid ""
 "# apt install console-setup\n"
@@ -1501,7 +1477,7 @@ msgstr ""
 "# dpkg-reconfigure keyboard-configuration"
 
 #. Tag: para
-#: random-bits.xml:698
+#: random-bits.xml:691
 #, no-c-format
 msgid ""
 "Note that the keyboard cannot be set while in the chroot, but will be "
@@ -1511,13 +1487,13 @@ msgstr ""
 "chroot, но настройка будет произведена после следующей перезагрузки."
 
 #. Tag: title
-#: random-bits.xml:708
+#: random-bits.xml:701
 #, no-c-format
 msgid "Install a Kernel"
 msgstr "Установка ядра"
 
 #. Tag: para
-#: random-bits.xml:709
+#: random-bits.xml:702
 #, no-c-format
 msgid ""
 "If you intend to boot this system, you probably want a &arch-kernel; kernel "
@@ -1528,31 +1504,31 @@ msgstr ""
 "помощью:"
 
 #. Tag: screen
-#: random-bits.xml:714
+#: random-bits.xml:707
 #, no-c-format
 msgid "# apt search &kernelpackage;"
 msgstr "# apt search &kernelpackage;"
 
 #. Tag: para
-#: random-bits.xml:716
+#: random-bits.xml:709
 #, no-c-format
 msgid "Then install the kernel package of your choice using its package name."
 msgstr "Затем установите пакет с ядром, указав подходящий вам вариант."
 
 #. Tag: screen
-#: random-bits.xml:720
+#: random-bits.xml:713
 #, no-c-format
 msgid "# apt install &kernelpackage;-<replaceable>arch-etc</replaceable>"
 msgstr "# apt install &kernelpackage;-<replaceable>arch-etc</replaceable>"
 
 #. Tag: title
-#: random-bits.xml:726
+#: random-bits.xml:719
 #, no-c-format
 msgid "Set up the Boot Loader"
 msgstr "Установка системного загрузчика"
 
 #. Tag: para
-#: random-bits.xml:727
+#: random-bits.xml:720
 #, no-c-format
 msgid ""
 "To make your &debian-gnu; system bootable, set up your boot loader to load "
@@ -1567,7 +1543,7 @@ msgstr ""
 "&debian; chroot, чтобы сделать это."
 
 #. Tag: para
-#: random-bits.xml:734
+#: random-bits.xml:727
 #, no-c-format
 msgid ""
 "Check <userinput>info grub</userinput> <phrase arch=\"x86\">or "
@@ -1592,7 +1568,7 @@ msgstr ""
 "относящийся к системе, из которой его вызвали)</phrase>."
 
 #. Tag: para
-#: random-bits.xml:746
+#: random-bits.xml:739
 #, no-c-format
 msgid ""
 "Installing and setting up <classname>grub2</classname> is as easy as: "
@@ -1616,7 +1592,7 @@ msgstr ""
 "filename>."
 
 #. Tag: para
-#: random-bits.xml:756
+#: random-bits.xml:749
 #, no-c-format
 msgid ""
 "Note that this assumes that a <filename>/dev/sda</filename> device file has "
@@ -1628,13 +1604,13 @@ msgstr ""
 "command>, но они здесь не описаны."
 
 #. Tag: para
-#: random-bits.xml:762
+#: random-bits.xml:755
 #, no-c-format
 msgid "Here is a basic <filename>/etc/lilo.conf</filename> as an example:"
 msgstr "Вот простой <filename>/etc/lilo.conf</filename> в качестве примера:"
 
 #. Tag: screen
-#: random-bits.xml:766
+#: random-bits.xml:759
 #, no-c-format
 msgid ""
 "boot=/dev/<replaceable>sda6</replaceable>\n"
@@ -1656,7 +1632,7 @@ msgstr ""
 "label=Debian"
 
 #. Tag: para
-#: random-bits.xml:768
+#: random-bits.xml:761
 #, no-c-format
 msgid ""
 "Check <userinput>man yaboot.conf</userinput> for instructions on setting up "
@@ -1676,7 +1652,7 @@ msgstr ""
 "системе, из которой его вызвали)."
 
 #. Tag: para
-#: random-bits.xml:778
+#: random-bits.xml:771
 #, no-c-format
 msgid ""
 "Here is a basic <filename>/etc/yaboot.conf</filename> as an example: "
@@ -1706,13 +1682,13 @@ msgstr ""
 "использовать <userinput>ide0:</userinput> вместо <userinput>hd:</userinput>."
 
 #. Tag: title
-#: random-bits.xml:791
+#: random-bits.xml:784
 #, no-c-format
 msgid "Remote access: Installing SSH and setting up access"
 msgstr "Удалённый доступ: установка SSH и настройка доступа"
 
 #. Tag: para
-#: random-bits.xml:792
+#: random-bits.xml:785
 #, no-c-format
 msgid ""
 "In case you can login to the system via console, you can skip this section. "
@@ -1758,7 +1734,7 @@ msgstr ""
 "пользователя с паролем:"
 
 #. Tag: screen
-#: random-bits.xml:816
+#: random-bits.xml:809
 #, no-c-format
 msgid ""
 "# adduser joe\n"
@@ -1768,13 +1744,13 @@ msgstr ""
 "# passwd joe"
 
 #. Tag: title
-#: random-bits.xml:821
+#: random-bits.xml:814
 #, no-c-format
 msgid "Finishing touches"
 msgstr "Заключительные шаги"
 
 #. Tag: para
-#: random-bits.xml:822
+#: random-bits.xml:815
 #, no-c-format
 msgid ""
 "As mentioned earlier, the installed system will be very basic. If you would "
@@ -1793,7 +1769,7 @@ msgstr ""
 "<command>apt</command> для установки отдельных пакетов."
 
 #. Tag: para
-#: random-bits.xml:833
+#: random-bits.xml:826
 #, no-c-format
 msgid ""
 "After the installation there will be a lot of downloaded packages in "
@@ -1805,19 +1781,19 @@ msgstr ""
 "запустив:"
 
 #. Tag: screen
-#: random-bits.xml:839
+#: random-bits.xml:832
 #, no-c-format
 msgid "# apt clean"
 msgstr "# apt clean"
 
 #. Tag: title
-#: random-bits.xml:850
+#: random-bits.xml:843
 #, no-c-format
 msgid "Installing &debian-gnu; over Parallel Line IP (PLIP)"
 msgstr "Установка &debian-gnu; через Parallel Line IP (PLIP)"
 
 #. Tag: para
-#: random-bits.xml:852
+#: random-bits.xml:845
 #, no-c-format
 msgid ""
 "This section explains how to install &debian-gnu; on a computer without an "
@@ -1833,7 +1809,7 @@ msgstr ""
 "Интернет)."
 
 #. Tag: para
-#: random-bits.xml:860
+#: random-bits.xml:853
 #, no-c-format
 msgid ""
 "In the example in this appendix we will set up a PLIP connection using a "
@@ -1849,7 +1825,7 @@ msgstr ""
 "не должны использоваться в вашем сетевом адресном пространстве)."
 
 #. Tag: para
-#: random-bits.xml:868
+#: random-bits.xml:861
 #, no-c-format
 msgid ""
 "The PLIP connection set up during the installation will also be available "
@@ -1860,7 +1836,7 @@ msgstr ""
 "перезагрузки в установленную систему (смотрите <xref linkend=\"boot-new\"/>)."
 
 #. Tag: para
-#: random-bits.xml:873
+#: random-bits.xml:866
 #, no-c-format
 msgid ""
 "Before you start, you will need to check the BIOS configuration (IO base "
@@ -1873,13 +1849,13 @@ msgstr ""
 "<literal>io=0x378</literal>, <literal>irq=7</literal>."
 
 #. Tag: title
-#: random-bits.xml:883
+#: random-bits.xml:876
 #, no-c-format
 msgid "Requirements"
 msgstr "Требования"
 
 #. Tag: para
-#: random-bits.xml:886
+#: random-bits.xml:879
 #, no-c-format
 msgid ""
 "A target computer, called <emphasis>target</emphasis>, where &debian; will "
@@ -1889,7 +1865,7 @@ msgstr ""
 "установлен &debian;."
 
 #. Tag: para
-#: random-bits.xml:892
+#: random-bits.xml:885
 #, no-c-format
 msgid "System installation media; see <xref linkend=\"installation-media\"/>."
 msgstr ""
@@ -1897,7 +1873,7 @@ msgstr ""
 "\"/>."
 
 #. Tag: para
-#: random-bits.xml:897
+#: random-bits.xml:890
 #, no-c-format
 msgid ""
 "Another computer connected to the Internet, called <emphasis>source</"
@@ -1907,7 +1883,7 @@ msgstr ""
 "emphasis>, будет использоваться в качестве шлюза."
 
 #. Tag: para
-#: random-bits.xml:903
+#: random-bits.xml:896
 #, no-c-format
 msgid ""
 "A DB-25 Null-Modem cable. See the <ulink url=\"&url-plip-install-howto;"
@@ -1918,13 +1894,13 @@ msgstr ""
 "<ulink url=\"&url-plip-install-howto;\">PLIP-Install-HOWTO</ulink>."
 
 #. Tag: title
-#: random-bits.xml:915
+#: random-bits.xml:908
 #, no-c-format
 msgid "Setting up source"
 msgstr "Настройка источника"
 
 #. Tag: para
-#: random-bits.xml:916
+#: random-bits.xml:909
 #, no-c-format
 msgid ""
 "The following shell script is a simple example of how to configure the "
@@ -1934,7 +1910,7 @@ msgstr ""
 "источника в качестве шлюза в Интернет через ppp0."
 
 #. Tag: screen
-#: random-bits.xml:921
+#: random-bits.xml:914
 #, no-c-format
 msgid ""
 "#!/bin/sh\n"
@@ -1976,13 +1952,13 @@ msgstr ""
 "echo 1 &gt; /proc/sys/net/ipv4/ip_forward"
 
 #. Tag: title
-#: random-bits.xml:927
+#: random-bits.xml:920
 #, no-c-format
 msgid "Installing target"
 msgstr "Установка приёмника"
 
 #. Tag: para
-#: random-bits.xml:928
+#: random-bits.xml:921
 #, no-c-format
 msgid ""
 "Boot the installation media. The installation needs to be run in expert "
@@ -2008,13 +1984,13 @@ msgstr ""
 "различных этапах установки."
 
 #. Tag: guimenuitem
-#: random-bits.xml:947
+#: random-bits.xml:940
 #, no-c-format
 msgid "Load installer components from CD"
 msgstr "Загрузка компонент программы установки с CD"
 
 #. Tag: para
-#: random-bits.xml:949
+#: random-bits.xml:942
 #, no-c-format
 msgid ""
 "Select the <userinput>plip-modules</userinput> option from the list; this "
@@ -2024,13 +2000,13 @@ msgstr ""
 "доступным PLIP драйвера для программы установки."
 
 #. Tag: guimenuitem
-#: random-bits.xml:957
+#: random-bits.xml:950
 #, no-c-format
 msgid "Detect network hardware"
 msgstr "Определение сетевой карты"
 
 #. Tag: para
-#: random-bits.xml:962
+#: random-bits.xml:955
 #, no-c-format
 msgid ""
 "If target <emphasis>does</emphasis> have a network card, a list of driver "
@@ -2045,7 +2021,7 @@ msgstr ""
 "установки не покажет этого списка."
 
 #. Tag: para
-#: random-bits.xml:971
+#: random-bits.xml:964
 #, no-c-format
 msgid ""
 "Because no network card was detected/selected earlier, the installer will "
@@ -2057,19 +2033,19 @@ msgstr ""
 "<userinput>plip</userinput>."
 
 #. Tag: guimenuitem
-#: random-bits.xml:983
+#: random-bits.xml:976
 #, no-c-format
 msgid "Configure the network"
 msgstr "Настройка сети"
 
 #. Tag: para
-#: random-bits.xml:986
+#: random-bits.xml:979
 #, no-c-format
 msgid "Auto-configure network with DHCP: No"
 msgstr "Настроить сеть автоматически с помощью DHCP: нет"
 
 #. Tag: para
-#: random-bits.xml:991
+#: random-bits.xml:984
 #, no-c-format
 msgid ""
 "IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
@@ -2077,7 +2053,7 @@ msgstr ""
 "IP-адрес: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
 
 #. Tag: para
-#: random-bits.xml:996
+#: random-bits.xml:989
 #, no-c-format
 msgid ""
 "Point-to-point address: <userinput><replaceable>192.168.0.2</replaceable></"
@@ -2086,7 +2062,7 @@ msgstr ""
 "Адрес PPP: <userinput><replaceable>192.168.0.2</replaceable></userinput>"
 
 #. Tag: para
-#: random-bits.xml:1002
+#: random-bits.xml:995
 #, no-c-format
 msgid ""
 "Name server addresses: you can enter the same addresses used on source (see "
@@ -2096,13 +2072,13 @@ msgstr ""
 "(смотрите <filename>/etc/resolv.conf</filename>)"
 
 #. Tag: title
-#: random-bits.xml:1021
+#: random-bits.xml:1014
 #, no-c-format
 msgid "Installing &debian-gnu; using PPP over Ethernet (PPPoE)"
 msgstr "Установка &debian-gnu; с использованием PPP через Ethernet (PPPoE)"
 
 #. Tag: para
-#: random-bits.xml:1023
+#: random-bits.xml:1016
 #, no-c-format
 msgid ""
 "In some countries PPP over Ethernet (PPPoE) is a common protocol for "
@@ -2118,7 +2094,7 @@ msgstr ""
 "добиться. В этом разделе будет описано как это сделать."
 
 #. Tag: para
-#: random-bits.xml:1031
+#: random-bits.xml:1024
 #, no-c-format
 msgid ""
 "The PPPoE connection set up during the installation will also be available "
@@ -2130,7 +2106,7 @@ msgstr ""
 "\"/>)."
 
 #. Tag: para
-#: random-bits.xml:1036
+#: random-bits.xml:1029
 #, no-c-format
 msgid ""
 "To have the option of setting up and using PPPoE during the installation, "
@@ -2144,7 +2120,7 @@ msgstr ""
 "или floppy</phrase>)."
 
 #. Tag: para
-#: random-bits.xml:1043
+#: random-bits.xml:1036
 #, no-c-format
 msgid ""
 "Installing over PPPoE is mostly the same as any other installation. The "
@@ -2154,7 +2130,7 @@ msgstr ""
 "способа установки. Далее будут описаны различия."
 
 #. Tag: para
-#: random-bits.xml:1051
+#: random-bits.xml:1044
 #, no-c-format
 msgid ""
 "Boot the installer with the boot parameter <userinput>modules=ppp-udeb</"
@@ -2170,7 +2146,7 @@ msgstr ""
 "classname>) будет загружена и и запущена автоматически."
 
 #. Tag: para
-#: random-bits.xml:1066
+#: random-bits.xml:1059
 #, no-c-format
 msgid ""
 "Follow the regular initial steps of the installation (language, country and "
@@ -2190,7 +2166,7 @@ msgstr ""
 "quote> в строке приглашения к загрузке. </para> </footnote>)."
 
 #. Tag: para
-#: random-bits.xml:1085
+#: random-bits.xml:1078
 #, no-c-format
 msgid ""
 "The next step is the detection of network hardware, in order to identify any "
@@ -2200,7 +2176,7 @@ msgstr ""
 "целью распознавания имеющихся в системе карт Ethernet."
 
 #. Tag: para
-#: random-bits.xml:1091
+#: random-bits.xml:1084
 #, no-c-format
 msgid ""
 "After this the actual setup of PPPoE is started. The installer will probe "
@@ -2212,7 +2188,7 @@ msgstr ""
 "через все найденные интерфейсы Ethernet."
 
 #. Tag: para
-#: random-bits.xml:1097
+#: random-bits.xml:1090
 #, no-c-format
 msgid ""
 "It is possible that the concentrator will not to be found at the first "
@@ -2228,7 +2204,7 @@ msgstr ""
 "PPPoE-соединения</guimenuitem> из главного меню программы установки."
 
 #. Tag: para
-#: random-bits.xml:1106
+#: random-bits.xml:1099
 #, no-c-format
 msgid ""
 "After a concentrator is found, the user will be prompted to type the login "
@@ -2238,7 +2214,7 @@ msgstr ""
 "информацию (имя пользователя и пароль для PPPoE)."
 
 #. Tag: para
-#: random-bits.xml:1112
+#: random-bits.xml:1105
 #, no-c-format
 msgid ""
 "At this point the installer will use the provided information to establish "
@@ -2258,6 +2234,18 @@ msgstr ""
 "раз выбрав в меню <guimenuitem>Настройка и установление PPPoE-соединения</"
 "guimenuitem>."
 
+#~ msgid "Laptop"
+#~ msgstr "Для ноутбука"
+
+#~ msgid "&task-laptop-inst;"
+#~ msgstr "&task-laptop-inst;"
+
+#~ msgid "&task-laptop-dl;"
+#~ msgstr "&task-laptop-dl;"
+
+#~ msgid "&task-laptop-tot;"
+#~ msgstr "&task-laptop-tot;"
+
 #~ msgid ""
 #~ "# /usr/sbin/debootstrap --arch ARCH &releasename; \\\n"
 #~ "     /mnt/debinst http://ftp.us.debian.org/debian"