[SILENT_COMMIT] Update of POT and PO files for the manual

4 files changed, 48 insertions, 187 deletions

diff --git a/po/ru/preparing.po b/po/ru/preparing.po
index 9c4cf494f..c65584286 100644
--- a/po/ru/preparing.po
+++ b/po/ru/preparing.po
@@ -14,7 +14,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Tag: title
 #: preparing.xml:5
@@ -403,7 +404,8 @@ msgstr "Руководство по установке"
 #: preparing.xml:251
 #, no-c-format
 msgid "This document you are now reading, in plain ASCII, HTML or PDF format."
-msgstr "Документ, который вы сейчас читаете, доступен в форматах ASCII, HTML или PDF."
+msgstr ""
+"Документ, который вы сейчас читаете, доступен в форматах ASCII, HTML или PDF."
 
 #. Tag: itemizedlist
 #: preparing.xml:257
@@ -445,7 +447,8 @@ msgstr "Техническая документация"
 #. Tag: para
 #: preparing.xml:285
 #, no-c-format
-msgid "Often contains useful information on configuring or using your hardware."
+msgid ""
+"Often contains useful information on configuring or using your hardware."
 msgstr ""
 "Часто содержит полезную информацию по настройке и использованию вашего "
 "аппаратного обеспечения."
@@ -564,7 +567,8 @@ msgstr "Информацию по аппаратному обеспечению
 #: preparing.xml:398
 #, no-c-format
 msgid "The manuals that come with each piece of hardware."
-msgstr "В руководствах, которые были вместе с приобретённым аппаратным обеспечением."
+msgstr ""
+"В руководствах, которые были вместе с приобретённым аппаратным обеспечением."
 
 #. Tag: para
 #: preparing.xml:403
@@ -978,7 +982,8 @@ msgstr ""
 msgid ""
 "The system on your network that you should use as a DNS (Domain Name "
 "Service) server."
-msgstr "Система в сети, которая используется как DNS (Domain Name Service) сервер."
+msgstr ""
+"Система в сети, которая используется как DNS (Domain Name Service) сервер."
 
 #. Tag: para
 #: preparing.xml:631
@@ -1044,7 +1049,8 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:678
 #, no-c-format
-msgid "A Pentium 4, 1GHz system is the minimum recommended for a desktop system."
+msgid ""
+"A Pentium 4, 1GHz system is the minimum recommended for a desktop system."
 msgstr ""
 "Минимальной рекомендуемой конфигурацией для настольной системыявляется "
 "машина с процессором Pentium 4, 1 ГГц."
@@ -1520,7 +1526,8 @@ msgstr ""
 #: preparing.xml:955
 #, no-c-format
 msgid "Boot the Debian installer to continue installing Debian."
-msgstr "Загрузить программу установки Debian, чтобы продолжить установку Debian."
+msgstr ""
+"Загрузить программу установки Debian, чтобы продолжить установку Debian."
 
 #. Tag: title
 #: preparing.xml:969
@@ -2255,7 +2262,8 @@ msgstr ""
 #: preparing.xml:1395
 #, no-c-format
 msgid "Pre-Installation Hardware and Operating System Setup"
-msgstr "Настройка аппаратного обеспечения и операционной системы перед установкой"
+msgstr ""
+"Настройка аппаратного обеспечения и операционной системы перед установкой"
 
 #. Tag: para
 #: preparing.xml:1396
@@ -2555,7 +2563,8 @@ msgstr "Изменение порядка загрузки на компьюте
 #. Tag: para
 #: preparing.xml:1603
 #, no-c-format
-msgid "As your computer starts, press the keys to enter the SCSI setup utility."
+msgid ""
+"As your computer starts, press the keys to enter the SCSI setup utility."
 msgstr ""
 "Как только компьютер начнёт загружаться, нажмите клавиши для входа в меню "
 "настройки SCSI."
@@ -2591,7 +2600,8 @@ msgstr "Найдите пункт изменения порядка загруз
 #. Tag: para
 #: preparing.xml:1627
 #, no-c-format
-msgid "Set the utility so that the SCSI ID of the CD drive is first on the list."
+msgid ""
+"Set the utility so that the SCSI ID of the CD drive is first on the list."
 msgstr "Настройте так, что SCSI ID привода компакт дисков был первым в списке."
 
 #. Tag: para
@@ -2825,13 +2835,6 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:1787
 #, no-c-format
-#| msgid ""
-#| "On &arch-title; Macintoshes, you invoke OpenFirmware with "
-#| "<keycombo><keycap>Command (cloverleaf/Apple)</keycap> <keycap>Option </"
-#| "keycap> <keycap>o</keycap> <keycap>f</keycap></keycombo> while booting. "
-#| "Generally it will check for these keystrokes after the chime, but the "
-#| "exact timing varies from model to model. See <ulink url=\"&url-netbsd-"
-#| "powerpc-faq;\"></ulink> for more hints."
 msgid ""
 "On &arch-title; Macintoshes, you invoke OpenFirmware with "
 "<keycombo><keycap>Command (cloverleaf/Apple)</keycap><keycap>Option</"
@@ -3298,4 +3301,3 @@ msgstr ""
 "программы установки вместо отображения пользовательского интерфейса, "
 "попробуйте изменить настройки экрана в MacOS на использование 256 цветов "
 "вместо <quote>тысяч</quote> или <quote>миллионов</quote>."
-
diff --git a/po/ru/preseed.po b/po/ru/preseed.po
index c65bb20be..546ed577e 100644
--- a/po/ru/preseed.po
+++ b/po/ru/preseed.po
@@ -14,7 +14,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Tag: title
 #: preseed.xml:16
@@ -174,8 +175,10 @@ msgstr "<entry>нет</entry>"
 #. Tag: entry
 #: preseed.xml:93
 #, no-c-format
-msgid "hd-media <phrase condition=\"bootable-usb\">(including usb-stick)</phrase>"
-msgstr "hd-media <phrase condition=\"bootable-usb\">(включая usb-носители)</phrase>"
+msgid ""
+"hd-media <phrase condition=\"bootable-usb\">(including usb-stick)</phrase>"
+msgstr ""
+"hd-media <phrase condition=\"bootable-usb\">(включая usb-носители)</phrase>"
 
 #. Tag: entry
 #: preseed.xml:98
@@ -681,7 +684,8 @@ msgstr "если в URL не указан протокол, то использ�
 msgid ""
 "if the hostname section contains no periods, it has the domain derived from "
 "DHCP appended to it, and"
-msgstr "если в имени машины нет точек, то будет добавлен домен, полученный по DHCP, и"
+msgstr ""
+"если в имени машины нет точек, то будет добавлен домен, полученный по DHCP, и"
 
 #. Tag: para
 #: preseed.xml:431
@@ -804,7 +808,8 @@ msgstr "Полезные в автоматизации псевдонимы"
 #: preseed.xml:495
 #, no-c-format
 msgid "The following aliases can be useful when using (auto mode) preseeding."
-msgstr "Следующие псевдонимы могут быть полезны при автоматизации (режим auto)."
+msgstr ""
+"Следующие псевдонимы могут быть полезны при автоматизации (режим auto)."
 
 #. Tag: entry
 #: preseed.xml:505
@@ -948,7 +953,8 @@ msgstr "mirror/suite"
 #: preseed.xml:523
 #, no-c-format
 msgid "Using a DHCP server to specify preconfiguration files"
-msgstr "Использование сервера DHCP для указания файлов автоматической конфигурации"
+msgstr ""
+"Использование сервера DHCP для указания файлов автоматической конфигурации"
 
 #. Tag: para
 #: preseed.xml:524
@@ -1035,13 +1041,16 @@ msgstr ""
 #: preseed.xml:565
 #, no-c-format
 msgid "&lt;owner&gt; &lt;question name&gt; &lt;question type&gt; &lt;value&gt;"
-msgstr "&lt;владелец&gt; &lt;имя вопроса&gt; &lt;тип вопроса&gt; &lt;значение&gt;"
+msgstr ""
+"&lt;владелец&gt; &lt;имя вопроса&gt; &lt;тип вопроса&gt; &lt;значение&gt;"
 
 #. Tag: para
 #: preseed.xml:567
 #, no-c-format
-msgid "There are a few rules to keep in mind when writing a preconfiguration file."
-msgstr "При написании файла ответов есть несколько правил, которые нужно помнить."
+msgid ""
+"There are a few rules to keep in mind when writing a preconfiguration file."
+msgstr ""
+"При написании файла ответов есть несколько правил, которые нужно помнить."
 
 #. Tag: para
 #: preseed.xml:574
@@ -1623,79 +1632,6 @@ msgstr ""
 #. Tag: screen
 #: preseed.xml:816
 #, no-c-format
-#| msgid ""
-#| "# If the system has free space you can choose to only partition that "
-#| "space.\n"
-#| "# Note: this must be preseeded with a localized (translated) value.\n"
-#| "#d-i partman-auto/init_automatically_partition \\\n"
-#| "#      select Guided - use the largest continuous free space\n"
-#| "\n"
-#| "# Alternatively, you can specify a disk to partition. The device name "
-#| "must\n"
-#| "# be given in traditional non-devfs format.\n"
-#| "# For example, to use the first SCSI/SATA hard disk:\n"
-#| "d-i partman-auto/disk string /dev/sda\n"
-#| "# Note: If you want to use whatever disk is available, no matter\n"
-#| "# what its device name, comment the line above out. This will only work "
-#| "if\n"
-#| "# the system only has one disk.\n"
-#| "# In addition, you'll need to specify the method to use.\n"
-#| "# The presently available methods are: \"regular\", \"lvm\" and \"crypto"
-#| "\"\n"
-#| "d-i partman-auto/method string lvm\n"
-#| "\n"
-#| "# If one of the disks that are going to be automatically partitioned\n"
-#| "# contains an old LVM configuration, the user will normally receive a\n"
-#| "# warning. This can be preseeded away...\n"
-#| "d-i partman-lvm/device_remove_lvm boolean true\n"
-#| "# And the same goes for the confirmation to write the lvm partitions.\n"
-#| "d-i partman-lvm/confirm boolean true\n"
-#| "\n"
-#| "# You can choose from any of the predefined partitioning recipes.\n"
-#| "# Note: this must be preseeded with a localized (translated) value.\n"
-#| "d-i partman-auto/choose_recipe \\\n"
-#| "       select All files in one partition (recommended for new users)\n"
-#| "#d-i partman-auto/choose_recipe \\\n"
-#| "#       select Separate /home partition\n"
-#| "#d-i partman-auto/choose_recipe \\\n"
-#| "#       select Separate /home, /usr, /var, and /tmp partitions\n"
-#| "\n"
-#| "# Or provide a recipe of your own...\n"
-#| "# The recipe format is documented in the file devel/partman-auto-recipe."
-#| "txt.\n"
-#| "# If you have a way to get a recipe file into the d-i environment, you "
-#| "can\n"
-#| "# just point at it.\n"
-#| "#d-i partman-auto/expert_recipe_file string /hd-media/recipe\n"
-#| "\n"
-#| "# If not, you can put an entire recipe into the preconfiguration file in "
-#| "one\n"
-#| "# (logical) line. This example creates a small /boot partition, suitable\n"
-#| "# swap, and uses the rest of the space for the root partition:\n"
-#| "#d-i partman-auto/expert_recipe string                         \\\n"
-#| "#      boot-root ::                                            \\\n"
-#| "#              40 50 100 ext3                                  \\\n"
-#| "#                      $primary{ } $bootable{ }                \\\n"
-#| "#                      method{ format } format{ }              \\\n"
-#| "#                      use_filesystem{ } filesystem{ ext3 }    \\\n"
-#| "#                      mountpoint{ /boot }                     \\\n"
-#| "#              .                                               \\\n"
-#| "#              500 10000 1000000000 ext3                       \\\n"
-#| "#                      method{ format } format{ }              \\\n"
-#| "#                      use_filesystem{ } filesystem{ ext3 }    \\\n"
-#| "#                      mountpoint{ / }                         \\\n"
-#| "#              .                                               \\\n"
-#| "#              64 512 300% linux-swap                          \\\n"
-#| "#                      method{ swap } format{ }                \\\n"
-#| "#              .\n"
-#| "\n"
-#| "# This makes partman automatically partition without confirmation, "
-#| "provided\n"
-#| "# that you told it what to do using one of the methods above.\n"
-#| "d-i partman/confirm_write_new_label boolean true\n"
-#| "d-i partman/choose_partition \\\n"
-#| "       select Finish partitioning and write changes to disk\n"
-#| "d-i partman/confirm boolean true"
 msgid ""
 "# If the system has free space you can choose to only partition that space.\n"
 "# Note: this must be preseeded with a localized (translated) value.\n"
@@ -1771,8 +1707,8 @@ msgstr ""
 "#Или же, вы можете задать размечаемый диск. Имя устройства\n"
 "# должно задаваться в обычном не-devfs формате.\n"
 "# Например, для использования первого жёсткого диска SCSI/SATA:\n"
-"# Замечание: если в системе более одного жёсткого диска, то "
-"# диск нужно указывать.\n"
+"# Замечание: если в системе более одного жёсткого диска, то # диск нужно "
+"указывать.\n"
 "#d-i partman-auto/disk string /dev/sda\n"
 "# Также, вы можете указать какой метод использовать.\n"
 "# Доступные методы: \"regular\", \"lvm\" и \"crypto\"\n"
@@ -2132,7 +2068,8 @@ msgstr ""
 #. Tag: para
 #: preseed.xml:896
 #, no-c-format
-msgid "The following command can be used to generate an MD5 hash for a password:"
+msgid ""
+"The following command can be used to generate an MD5 hash for a password:"
 msgstr "С помощью следующей команды можно сгенерировать MD5 хеш для пароля:"
 
 #. Tag: screen
@@ -2658,7 +2595,8 @@ msgstr ""
 #: preseed.xml:1046
 #, no-c-format
 msgid "Using preseeding to change default values"
-msgstr "Использование автоматической установки для изменения значений по умолчанию"
+msgstr ""
+"Использование автоматической установки для изменения значений по умолчанию"
 
 #. Tag: para
 #: preseed.xml:1047
@@ -2799,4 +2737,3 @@ msgstr ""
 "разных по сути метода автоматизации, что, например, приведёт к выполнению "
 "команды из preseed/early дважды: один раз из первого метода, второй раз "
 "после включения сети."
-
diff --git a/po/zh_CN/preparing.po b/po/zh_CN/preparing.po
index a2a240674..4a8856aa8 100644
--- a/po/zh_CN/preparing.po
+++ b/po/zh_CN/preparing.po
@@ -2640,13 +2640,6 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:1787
 #, no-c-format
-#| msgid ""
-#| "On &arch-title; Macintoshes, you invoke OpenFirmware with "
-#| "<keycombo><keycap>Command (cloverleaf/Apple)</keycap> <keycap>Option </"
-#| "keycap> <keycap>o</keycap> <keycap>f</keycap></keycombo> while booting. "
-#| "Generally it will check for these keystrokes after the chime, but the "
-#| "exact timing varies from model to model. See <ulink url=\"&url-netbsd-"
-#| "powerpc-faq;\"></ulink> for more hints."
 msgid ""
 "On &arch-title; Macintoshes, you invoke OpenFirmware with "
 "<keycombo><keycap>Command (cloverleaf/Apple)</keycap><keycap>Option</"
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 633324c1c..635da3d8c 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -1493,79 +1493,6 @@ msgstr ""
 #. Tag: screen
 #: preseed.xml:816
 #, no-c-format
-#| msgid ""
-#| "# If the system has free space you can choose to only partition that "
-#| "space.\n"
-#| "# Note: this must be preseeded with a localized (translated) value.\n"
-#| "#d-i partman-auto/init_automatically_partition \\\n"
-#| "#      select Guided - use the largest continuous free space\n"
-#| "\n"
-#| "# Alternatively, you can specify a disk to partition. The device name "
-#| "must\n"
-#| "# be given in traditional non-devfs format.\n"
-#| "# For example, to use the first SCSI/SATA hard disk:\n"
-#| "d-i partman-auto/disk string /dev/sda\n"
-#| "# Note: If you want to use whatever disk is available, no matter\n"
-#| "# what its device name, comment the line above out. This will only work "
-#| "if\n"
-#| "# the system only has one disk.\n"
-#| "# In addition, you'll need to specify the method to use.\n"
-#| "# The presently available methods are: \"regular\", \"lvm\" and \"crypto"
-#| "\"\n"
-#| "d-i partman-auto/method string lvm\n"
-#| "\n"
-#| "# If one of the disks that are going to be automatically partitioned\n"
-#| "# contains an old LVM configuration, the user will normally receive a\n"
-#| "# warning. This can be preseeded away...\n"
-#| "d-i partman-lvm/device_remove_lvm boolean true\n"
-#| "# And the same goes for the confirmation to write the lvm partitions.\n"
-#| "d-i partman-lvm/confirm boolean true\n"
-#| "\n"
-#| "# You can choose from any of the predefined partitioning recipes.\n"
-#| "# Note: this must be preseeded with a localized (translated) value.\n"
-#| "d-i partman-auto/choose_recipe \\\n"
-#| "       select All files in one partition (recommended for new users)\n"
-#| "#d-i partman-auto/choose_recipe \\\n"
-#| "#       select Separate /home partition\n"
-#| "#d-i partman-auto/choose_recipe \\\n"
-#| "#       select Separate /home, /usr, /var, and /tmp partitions\n"
-#| "\n"
-#| "# Or provide a recipe of your own...\n"
-#| "# The recipe format is documented in the file devel/partman-auto-recipe."
-#| "txt.\n"
-#| "# If you have a way to get a recipe file into the d-i environment, you "
-#| "can\n"
-#| "# just point at it.\n"
-#| "#d-i partman-auto/expert_recipe_file string /hd-media/recipe\n"
-#| "\n"
-#| "# If not, you can put an entire recipe into the preconfiguration file in "
-#| "one\n"
-#| "# (logical) line. This example creates a small /boot partition, suitable\n"
-#| "# swap, and uses the rest of the space for the root partition:\n"
-#| "#d-i partman-auto/expert_recipe string                         \\\n"
-#| "#      boot-root ::                                            \\\n"
-#| "#              40 50 100 ext3                                  \\\n"
-#| "#                      $primary{ } $bootable{ }                \\\n"
-#| "#                      method{ format } format{ }              \\\n"
-#| "#                      use_filesystem{ } filesystem{ ext3 }    \\\n"
-#| "#                      mountpoint{ /boot }                     \\\n"
-#| "#              .                                               \\\n"
-#| "#              500 10000 1000000000 ext3                       \\\n"
-#| "#                      method{ format } format{ }              \\\n"
-#| "#                      use_filesystem{ } filesystem{ ext3 }    \\\n"
-#| "#                      mountpoint{ / }                         \\\n"
-#| "#              .                                               \\\n"
-#| "#              64 512 300% linux-swap                          \\\n"
-#| "#                      method{ swap } format{ }                \\\n"
-#| "#              .\n"
-#| "\n"
-#| "# This makes partman automatically partition without confirmation, "
-#| "provided\n"
-#| "# that you told it what to do using one of the methods above.\n"
-#| "d-i partman/confirm_write_new_label boolean true\n"
-#| "d-i partman/choose_partition \\\n"
-#| "       select Finish partitioning and write changes to disk\n"
-#| "d-i partman/confirm boolean true"
 msgid ""
 "# If the system has free space you can choose to only partition that space.\n"
 "# Note: this must be preseeded with a localized (translated) value.\n"
@@ -1663,12 +1590,14 @@ msgstr ""
 "#       select Separate /home, /usr, /var, and /tmp partitions\n"
 "\n"
 "# Or provide a recipe of your own...\n"
-"# The recipe format is documented in the file devel/partman-auto-recipe.txt.\n"
+"# The recipe format is documented in the file devel/partman-auto-recipe."
+"txt.\n"
 "# If you have a way to get a recipe file into the d-i environment, you can\n"
 "# just point at it.\n"
 "#d-i partman-auto/expert_recipe_file string /hd-media/recipe\n"
 "\n"
-"# If not, you can put an entire recipe into the preconfiguration file in one\n"
+"# If not, you can put an entire recipe into the preconfiguration file in "
+"one\n"
 "# (logical) line. This example creates a small /boot partition, suitable\n"
 "# swap, and uses the rest of the space for the root partition:\n"
 "#d-i partman-auto/expert_recipe string                         \\\n"