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

4 files changed, 53 insertions, 75 deletions

diff --git a/po/ru/random-bits.po b/po/ru/random-bits.po
index ec37365b9..f1cd42910 100644
--- a/po/ru/random-bits.po
+++ b/po/ru/random-bits.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
 #: random-bits.xml:4
@@ -1107,7 +1108,8 @@ msgstr "Некоторые доступные способы:"
 #: random-bits.xml:541
 #, no-c-format
 msgid "create a default set of static device files using"
-msgstr "создание используемого по умолчанию набора статических файлов устройств"
+msgstr ""
+"создание используемого по умолчанию набора статических файлов устройств"
 
 #. Tag: screen
 #: random-bits.xml:544
@@ -1122,7 +1124,8 @@ msgstr ""
 #. Tag: para
 #: random-bits.xml:547
 #, no-c-format
-msgid "manually create only specific device files using <command>MAKEDEV</command>"
+msgid ""
+"manually create only specific device files using <command>MAKEDEV</command>"
 msgstr ""
 "создание вручную только выбранных файлов устройств с помощью "
 "<command>MAKEDEV</command>"
@@ -2075,8 +2078,10 @@ msgstr "Настроить сеть автоматически с помощью
 #. Tag: para
 #: random-bits.xml:991
 #, no-c-format
-msgid "IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
-msgstr "IP-адрес: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
+msgid ""
+"IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
+msgstr ""
+"IP-адрес: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
 
 #. Tag: para
 #: random-bits.xml:996
@@ -2084,7 +2089,8 @@ msgstr "IP-адрес: <userinput><replaceable>192.168.0.1</replaceable></userin
 msgid ""
 "Point-to-point address: <userinput><replaceable>192.168.0.2</replaceable></"
 "userinput>"
-msgstr "Адрес PPP: <userinput><replaceable>192.168.0.2</replaceable></userinput>"
+msgstr ""
+"Адрес PPP: <userinput><replaceable>192.168.0.2</replaceable></userinput>"
 
 #. Tag: para
 #: random-bits.xml:1002
@@ -2482,22 +2488,17 @@ msgid ""
 "that there are some known issues. We continue to work on resolving these."
 msgstr ""
 "Графическая версия программы установки была написана не так давно, и поэтому "
-"имеет несколько известных проблем. Мы продолжаем работать над их "
-"устранением."
+"имеет несколько известных проблем. Мы продолжаем работать над их устранением."
 
 #. Tag: para
 #: random-bits.xml:1255
 #, no-c-format
-#| msgid ""
-#| "Information on some screens is not nicely formatted into columns as it "
-#| "should be. The most obvious example is the first screen where you select "
-#| "your language. Another example is the main screen of partman."
 msgid ""
 "Information on some screens is not yet nicely formatted into columns as it "
 "should be. This is most visible during partitioning."
 msgstr ""
-"Информация на нескольких экранах не очень красиво отформатирована по столбцам "
-"как должна. Наиболее очевидный пример &mdash; вид разметки дисков."
+"Информация на нескольких экранах не очень красиво отформатирована по "
+"столбцам как должна. Наиболее очевидный пример &mdash; вид разметки дисков."
 
 #. Tag: para
 #: random-bits.xml:1261
@@ -2555,4 +2556,3 @@ msgstr ""
 #, no-c-format
 msgid "# chroot /target"
 msgstr "# chroot /target"
-
diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index 506872d88..1d2d23574 100644
--- a/po/zh_CN/hardware.po
+++ b/po/zh_CN/hardware.po
@@ -4076,16 +4076,15 @@ msgstr "内存与磁盘空间的需求"
 #. Tag: para
 #: hardware.xml:2340
 #, no-c-format
-#| msgid ""
-#| "You must have at least &minimum-memory; of memory and &minimum-fs-size; "
-#| "of hard disk space. Note that these are really bare-minimum numbers. For "
-#| "more realistic figures, see <xref linkend=\"minimum-hardware-reqts\"/>."
 msgid ""
 "You must have at least &minimum-memory; of memory and &minimum-fs-size; of "
 "hard disk space to perform a normal installation. Note that these are fairly "
 "minimal numbers. For more realistic figures, see <xref linkend=\"minimum-"
 "hardware-reqts\"/>."
-msgstr "您必须至少有 &minimum-memory; 的内存和 &minimum-fs-size; 的硬盘空间来进行普通安装。注意这是最小的数字，要了解实际的情况，参阅 <xref linkend=\"minimum-hardware-reqts\"/>。"
+msgstr ""
+"您必须至少有 &minimum-memory; 的内存和 &minimum-fs-size; 的硬盘空间来进行普通"
+"安装。注意这是最小的数字，要了解实际的情况，参阅 <xref linkend=\"minimum-"
+"hardware-reqts\"/>。"
 
 #. Tag: para
 #: hardware.xml:2347
@@ -4098,7 +4097,11 @@ msgid ""
 "between booting the regular and the graphical installer, the former should "
 "be selected. </para> </footnote> or disk space available may be possible but "
 "is only advised for experienced users."
-msgstr "在较小的内存<footnote condition=\"gtk\"> <para> 支持图形界面的安装映象会比文本界面需要更多的内存，并且内存不应少于 &minimum-memory; 。如果可以在普通和图形界面两种方式之间选择，应选择普通方式。</para> </footnote>或磁盘空间上安装系统或许可行，但只针对有经验的用户。"
+msgstr ""
+"在较小的内存<footnote condition=\"gtk\"> <para> 支持图形界面的安装映象会比文"
+"本界面需要更多的内存，并且内存不应少于 &minimum-memory; 。如果可以在普通和图"
+"形界面两种方式之间选择，应选择普通方式。</para> </footnote>或磁盘空间上安装系"
+"统或许可行，但只针对有经验的用户。"
 
 #. Tag: para
 #: hardware.xml:2364
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 89fb8a02c..c993ed649 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -985,7 +985,11 @@ msgid ""
 "debconf template should be used. Only variables that have their owner set to "
 "something other than <quote>d-i</quote> will be propagated to the debconf "
 "database for the installed system."
-msgstr "对于安装程序自己使用的 debconf 变量(模板)，owner 应该设置为 <quote>d-i</quote>；要在安装后的系统里面预置变量，应该使用名称中包含对应 debconf 模板的软件包。只有那些 owner 为非 <quote>d-i</quote> 的变量将被保存到安装后系统的 debconf 数据库里面。"
+msgstr ""
+"对于安装程序自己使用的 debconf 变量(模板)，owner 应该设置为 <quote>d-i</"
+"quote>；要在安装后的系统里面预置变量，应该使用名称中包含对应 debconf 模板的软"
+"件包。只有那些 owner 为非 <quote>d-i</quote> 的变量将被保存到安装后系统的 "
+"debconf 数据库里面。"
 
 #. Tag: para
 #: preseed.xml:592
@@ -1104,7 +1108,6 @@ msgstr ""
 #. Tag: title
 #: preseed.xml:661
 #, no-c-format
-#| msgid "Contents of the preconfiguration file"
 msgid "Contents of the preconfiguration file (for &releasename;)"
 msgstr "预置文件的内容(&releasename;)"
 
@@ -1242,14 +1245,6 @@ msgstr ""
 #. Tag: para
 #: preseed.xml:736
 #, no-c-format
-#| msgid ""
-#| "Although preseeding the network configuration is normally not possible "
-#| "when using network preseeding (using <quote>preseed/url</quote>), you can "
-#| "use the following hack to work around that, for example if you'd like to "
-#| "set a static address for the network interface. The hack is to force the "
-#| "network configuration to run again after the preconfiguration file has "
-#| "been loaded by creating a <quote>preseed/run</quote> script containing "
-#| "the following lines:"
 msgid ""
 "Although preseeding the network configuration is normally not possible when "
 "using network preseeding (using <quote>preseed/url</quote>), you can use the "
@@ -1258,7 +1253,10 @@ msgid ""
 "configuration to run again after the preconfiguration file has been loaded "
 "by creating a <quote>preseed/run</quote> script containing the following "
 "commands:"
-msgstr "虽然使用网络预置(用 <quote>preseed/url</quote>)通常并不能配置网络，但是您可以使用下面的技巧实现。例如，为网卡设置静态地址。它使加载了预置文件以后网络预置再运行一次，这需要将下面的命令包含在 <quote>preseed/run</quote> 脚本里面："
+msgstr ""
+"虽然使用网络预置(用 <quote>preseed/url</quote>)通常并不能配置网络，但是您可以"
+"使用下面的技巧实现。例如，为网卡设置静态地址。它使加载了预置文件以后网络预置"
+"再运行一次，这需要将下面的命令包含在 <quote>preseed/run</quote> 脚本里面："
 
 #. Tag: screen
 #: preseed.xml:746
@@ -2151,33 +2149,6 @@ msgstr "安装引导加载器"
 #. Tag: screen
 #: preseed.xml:987
 #, no-c-format
-#| msgid ""
-#| "# Grub is the default boot loader (for x86). If you want lilo installed\n"
-#| "# instead, uncomment this:\n"
-#| "#d-i grub-installer/skip boolean true\n"
-#| "# To also skip installing lilo, and install no bootloader, uncomment "
-#| "this\n"
-#| "# too:\n"
-#| "#d-i lilo-installer/skip boolean true\n"
-#| "\n"
-#| "# This is fairly safe to set, it makes grub install automatically to the "
-#| "MBR\n"
-#| "# if no other operating system is detected on the machine.\n"
-#| "d-i grub-installer/only_debian boolean true\n"
-#| "\n"
-#| "# This one makes grub-installer install to the MBR if it also finds some "
-#| "other\n"
-#| "# OS, which is less safe as it might not be able to boot that other OS.\n"
-#| "d-i grub-installer/with_other_os boolean true\n"
-#| "\n"
-#| "# Alternatively, if you want to install to a location other than the "
-#| "mbr,\n"
-#| "# uncomment and edit these lines:\n"
-#| "#d-i grub-installer/only_debian boolean false\n"
-#| "#d-i grub-installer/with_other_os boolean false\n"
-#| "#d-i grub-installer/bootdev  string (hd0,0)\n"
-#| "# To install grub to multiple disks:\n"
-#| "#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)"
 msgid ""
 "# Grub is the default boot loader (for x86). If you want lilo installed\n"
 "# instead, uncomment this:\n"
@@ -2217,11 +2188,13 @@ msgstr ""
 "# too:\n"
 "#d-i lilo-installer/skip boolean true\n"
 "\n"
-"# This is fairly safe to set, it makes grub install automatically to the MBR\n"
+"# This is fairly safe to set, it makes grub install automatically to the "
+"MBR\n"
 "# if no other operating system is detected on the machine.\n"
 "d-i grub-installer/only_debian boolean true\n"
 "\n"
-"# This one makes grub-installer install to the MBR if it also finds some other\n"
+"# This one makes grub-installer install to the MBR if it also finds some "
+"other\n"
 "# OS, which is less safe as it might not be able to boot that other OS.\n"
 "d-i grub-installer/with_other_os boolean true\n"
 "\n"
@@ -2246,7 +2219,10 @@ msgid ""
 "An MD5 hash for a password for <classname>grub</classname> can be generated "
 "using <command>grub-md5-crypt</command>, or using the command from the "
 "example in <xref linkend=\"preseed-account\"/>."
-msgstr "<classname>grub</classname> 使用的密码 MD5 值可以使用 <command>grub-md5-crypt</command> 生成，或者使用 <xref linkend=\"preseed-account\"/> 例子中的命令。"
+msgstr ""
+"<classname>grub</classname> 使用的密码 MD5 值可以使用 <command>grub-md5-"
+"crypt</command> 生成，或者使用 <xref linkend=\"preseed-account\"/> 例子中的命"
+"令。"
 
 #. Tag: title
 #: preseed.xml:999
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index b195e8f95..b9d417f84 100644
--- a/po/zh_CN/random-bits.po
+++ b/po/zh_CN/random-bits.po
@@ -2241,18 +2241,16 @@ msgstr ""
 #. Tag: para
 #: random-bits.xml:1189
 #, no-c-format
-#| msgid ""
-#| "You can add boot parameters when starting the graphical installer, just "
-#| "as with the regular installer. One of those parameters allows you to "
-#| "configure the mouse for left-handed use. See <xref linkend=\"boot-parms\"/"
-#| "> for valid parameters."
 msgid ""
 "Just as with the regular installer it is possible to add boot parameters "
 "when starting the graphical installer. One of those parameters allows to "
 "configure the mouse for left-handed use. Others allow to select the mouse "
 "device (e.g. for a serial mouse) and the mouse protocol. See <xref linkend="
 "\"boot-parms\"/> for valid parameters."
-msgstr "和普通安装方式一样，图形安装程序也可以在启动的时候设置引导参数。其中的一项是设置鼠标为左手习惯。其他的是选择鼠标设备(比如，串行鼠标)和鼠标协议。请参阅 <xref linkend=\"boot-parms\"/> 了解可用的参数。"
+msgstr ""
+"和普通安装方式一样，图形安装程序也可以在启动的时候设置引导参数。其中的一项是"
+"设置鼠标为左手习惯。其他的是选择鼠标设备(比如，串行鼠标)和鼠标协议。请参阅 "
+"<xref linkend=\"boot-parms\"/> 了解可用的参数。"
 
 #. Tag: para
 #: random-bits.xml:1198
@@ -2274,7 +2272,9 @@ msgid ""
 "graphical installer may fail to boot at all while booting the regular "
 "installer would still work. Using the regular installer is recommended for "
 "systems with little available memory."
-msgstr "如果您系统上的内存少于 &minimum-memory;，虽然普通安装程序可以启动，而图形安装程序可能根本无法启动。因此建议在较少内存的系统上使用普通安装程序。"
+msgstr ""
+"如果您系统上的内存少于 &minimum-memory;，虽然普通安装程序可以启动，而图形安装"
+"程序可能根本无法启动。因此建议在较少内存的系统上使用普通安装程序。"
 
 #. Tag: title
 #: random-bits.xml:1215
@@ -2340,19 +2340,18 @@ msgstr "已知事项"
 msgid ""
 "The graphical frontend to the installer is relatively new and because of "
 "that there are some known issues. We continue to work on resolving these."
-msgstr "对于安装程序来说，图形前端相对较新还有一些已知问题。我们会持续地解决这些问题。"
+msgstr ""
+"对于安装程序来说，图形前端相对较新还有一些已知问题。我们会持续地解决这些问"
+"题。"
 
 #. Tag: para
 #: random-bits.xml:1255
 #, no-c-format
-#| msgid ""
-#| "Information on some screens is not nicely formatted into columns as it "
-#| "should be. The most obvious example is the first screen where you select "
-#| "your language. Another example is the main screen of partman."
 msgid ""
 "Information on some screens is not yet nicely formatted into columns as it "
 "should be. This is most visible during partitioning."
-msgstr "有些画面中的信息没有很好地格式化进它该在的列中。最明显的是在分区的时候。"
+msgstr ""
+"有些画面中的信息没有很好地格式化进它该在的列中。最明显的是在分区的时候。"
 
 #. Tag: para
 #: random-bits.xml:1261