Update catalog

1 files changed, 86 insertions, 82 deletions

diff --git a/docs/docs/stable/installer/zh_CN.po b/docs/docs/stable/installer/zh_CN.po
index 9cf05f6c..418dde9e 100644
--- a/docs/docs/stable/installer/zh_CN.po
+++ b/docs/docs/stable/installer/zh_CN.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-13 16:48+0200\n"
+"POT-Creation-Date: 2019-01-15 12:24+0200\n"
 "PO-Revision-Date: 2017-05-21 06:29+0000\n"
 "Last-Translator: zwpwjwtz <zwpwjwtz@126.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/"
@@ -299,7 +299,7 @@ msgstr ""
 "置。<emphasis>登录名区分大小写。</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:88 en/setupBootloader.xml:87
+#: en/addUser.xml:88 en/setupBootloader.xml:124
 #, fuzzy
 msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
@@ -4307,8 +4307,8 @@ msgstr ""
 "选择 <guilabel>通用</guilabel> - <guilabel>强制 evdev</guilabel> 可用于配置超"
 "过五键的鼠标。"
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloaderAddEntry.xml:7 en/setupBootloader.xml:206
+#. type: Content of: <section><info><title>
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "添加或修改引导菜单项"
 
@@ -4334,24 +4334,24 @@ msgstr ""
 "Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:10
+#: en/setupBootloader.xml:27
 #, fuzzy
 msgid "Bootloader"
 msgstr "引导器界面"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:13
+#: en/setupBootloader.xml:31
 msgid "Grub2"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:15
+#: en/setupBootloader.xml:34
 #, fuzzy
 msgid "Grub2 on Legacy MBR/GPT systems"
 msgstr "GRUB2，当使用传统硬件 + MBR/GPT 格式分区时"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:17
+#: en/setupBootloader.xml:37
 #, fuzzy
 msgid ""
 "GRUB2 (with or without graphical menu) will be used exclusively as the "
@@ -4359,7 +4359,7 @@ msgid ""
 msgstr "GRUB2（包含/不包含图形界面），当使用传统硬件 + MBR/GPT格式分区时"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:21
+#: en/setupBootloader.xml:42
 #, fuzzy
 msgid ""
 "By default, a new bootloader will be written into either the MBR (Master "
@@ -4367,25 +4367,25 @@ msgid ""
 msgstr "GRUB 2 引导器安装至 MBR（主引导记录）区域或第一硬盘的 BIOS 引导分区。"
 
 #. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:49
 #, fuzzy
 msgid "Grub2-efi on UEFI systems"
 msgstr "GRUB2-efi，当使用 UEFI 硬件时"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:52
 msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:33
+#: en/setupBootloader.xml:57
 msgid ""
 "By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI "
 "System Partition)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:35
+#: en/setupBootloader.xml:60
 #, fuzzy
 msgid ""
 "If there are already UEFI-based operating systems installed on your computer "
@@ -4401,18 +4401,18 @@ msgstr ""
 "求。"
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:46
+#: en/setupBootloader.xml:72
 #, fuzzy
 msgid "Bootloader Setup"
 msgstr "引导器界面"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:76
 msgid "Bootloader main options"
 msgstr "引导程序的主要选项"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:51
+#: en/setupBootloader.xml:79
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4426,39 +4426,39 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:62
+#: en/setupBootloader.xml:91
 #, fuzzy
 msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
 msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:63
+#: en/setupBootloader.xml:93
 msgid ""
 "This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
 "systems will not see this option here."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:67
+#: en/setupBootloader.xml:98
 #, fuzzy
 msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:68
+#: en/setupBootloader.xml:100
 #, fuzzy
 msgid "Don't change this unless you really know what you are doing"
 msgstr "只有在您完全了解您的行为的风险后再作出改动。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:105
 #, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:74
+#: en/setupBootloader.xml:108
 #, fuzzy
 msgid ""
 "This text box lets you set a delay, in seconds, before the default operating "
@@ -4468,13 +4468,13 @@ msgstr ""
 "入默认选定的操作系统。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:78
+#: en/setupBootloader.xml:113
 #, fuzzy
 msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:115
 #, fuzzy
 msgid ""
 "This allows you to set a password for the bootloader. This means a username "
@@ -4487,19 +4487,19 @@ msgstr ""
 "式，或者修改引导参数。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:88
+#: en/setupBootloader.xml:126
 #, fuzzy
 msgid "Choose a password for the bootloader (optional)"
 msgstr "<guilabel>密码</guilabel>：此文本框用于输入密码"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:130
 #, fuzzy
 msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
 msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:92
+#: en/setupBootloader.xml:132
 #, fuzzy
 msgid ""
 "Retype the password and DrakX will check that it matches with the one set "
@@ -4509,19 +4509,19 @@ msgstr ""
 "否一致。"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:96 en/setupBootloader.xml:154
+#: en/setupBootloader.xml:137 en/setupBootloader.xml:212
 #, fuzzy
 msgid "<emphasis>Advanced</emphasis>"
 msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:141
 #, fuzzy
 msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr "<emphasis>通用</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:143
 #, fuzzy
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for power "
@@ -4535,13 +4535,13 @@ msgstr ""
 "偶尔会自动重启，或系统卡死），则可以取消勾选它。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:152
 #, fuzzy
 msgid "<emphasis>Enable SMP</emphasis>"
 msgstr "<emphasis>通用</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:109
+#: en/setupBootloader.xml:154
 #, fuzzy
 msgid ""
 "This option enables/disables symmetric multiprocessing for multi-core "
@@ -4551,13 +4551,13 @@ msgstr ""
 "性。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:159
 #, fuzzy
 msgid "<emphasis>Enable APIC</emphasis>"
 msgstr "<emphasis>通用</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:114
+#: en/setupBootloader.xml:161
 #, fuzzy
 msgid ""
 "Enabling this gives the operating system access to the Advanced Programmable "
@@ -4568,13 +4568,13 @@ msgstr ""
 "支持更复杂的优先级模型和高级 IRQ（中断请求）管理功能。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:168
 #, fuzzy
 msgid "<emphasis>Enable Local APIC</emphasis>"
 msgstr "<emphasis>通用</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:121
+#: en/setupBootloader.xml:170
 #, fuzzy
 msgid ""
 "Here you can set Local APIC, which manages all external interrupts for a "
@@ -4584,13 +4584,13 @@ msgstr ""
 "统中管理某个特定处理器的所有外部中断。"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:127
+#: en/setupBootloader.xml:177
 #, fuzzy
 msgid "Bootloader Configuration"
 msgstr "声音配置"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:180
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4604,40 +4604,40 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:139
+#: en/setupBootloader.xml:191
 #, fuzzy
 msgid "<emphasis role=\"bold\">Default</emphasis>"
 msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:140
+#: en/setupBootloader.xml:193
 #, fuzzy
-msgid "The operating system to started up by default"
+msgid "The operating system to be started up by default."
 msgstr "<guilabel>默认</guilabel>：使用默认引导参数"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:197
 #, fuzzy
 msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:144
+#: en/setupBootloader.xml:199
 #, fuzzy
 msgid ""
 "This option lets you pass information to the kernel or tell the kernel to "
-"give you more information as it boots"
+"give you more information as it boots."
 msgstr ""
 "<guilabel>追加</guilabel> ：用于在默认引导选项后添加额外所需的内核参数。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:148
+#: en/setupBootloader.xml:204
 #, fuzzy
 msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:149
+#: en/setupBootloader.xml:206
 #, fuzzy
 msgid ""
 "If you already have other operating systems installed, Mageia attempts to "
@@ -4649,7 +4649,7 @@ msgstr ""
 "<guilabel>检测其他操作系统</guilabel>"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:215
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4663,13 +4663,13 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:166
+#: en/setupBootloader.xml:226
 #, fuzzy
 msgid "<emphasis>Video mode</emphasis>"
 msgstr "<emphasis>供应商</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:167
+#: en/setupBootloader.xml:228
 #, fuzzy
 msgid ""
 "This sets the screen size and colour depth to be used by the boot menu. If "
@@ -4680,13 +4680,13 @@ msgstr ""
 "若要从可用的模式中进行选择，请点击下三角标记。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:172
+#: en/setupBootloader.xml:234
 #, fuzzy
 msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr "<emphasis>供应商</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:173
+#: en/setupBootloader.xml:236
 msgid ""
 "Select this option if you don't want a bootable Mageia, but would rather "
 "chain-load it from another OS. You will get a warning that the bootloader is "
@@ -4695,28 +4695,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:181
+#: en/setupBootloader.xml:245
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
 "\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
-"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:188
+#: en/setupBootloader.xml:253
 #, fuzzy
 msgid "Other Options"
 msgstr "选项"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:190
+#: en/setupBootloader.xml:256
 msgid "Using an existing bootloader"
 msgstr "使用现存的引导器"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:258
 #, fuzzy
 msgid ""
 "The exact procedure for adding Mageia to an existing bootloader is beyond "
@@ -4730,13 +4728,13 @@ msgstr ""
 "以便进一步操作。"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:267
 #, fuzzy
 msgid "Installing Without a Bootloader"
 msgstr "使用 Mageia 提供的引导器"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:200
+#: en/setupBootloader.xml:269
 msgid ""
 "While you can opt to install Mageia without a bootloader (see section 2.1 "
 "Advanced), this is not recommended unless you absolutely know what you are "
@@ -4744,27 +4742,6 @@ msgid ""
 "unable to start."
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:207
-#, fuzzy
-msgid ""
-"To do this you need to manually edit <filename>/boot/grub2/custom.cfg</"
-"filename> or use the software <application>grub-customizer</application> "
-"tool instead (available in the Mageia repositories)."
-msgstr ""
-"为此，您需要手动编辑 /boot/grub2/custom.cfg，或者使用 grub-customizer（可以"
-"从 Mageia 仓库中安装）来编辑引导项。"
-
-#. type: Content of: <section><section><section><note><para>
-#: en/setupBootloader.xml:212
-#, fuzzy
-msgid ""
-"For more information, see: <link ns4:href=\"https://wiki.mageia.org/en/Grub2-"
-"efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
-msgstr ""
-"有关更多信息，请参考我们的 wiki：<link ns2:href=\"https://wiki.mageia.org/en/"
-"Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
-
 #. type: Content of: <section><info><title>
 #: en/setupSCSI.xml:10
 msgid "Setup SCSI"
@@ -5155,6 +5132,33 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align="
+#~ "\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "To do this you need to manually edit <filename>/boot/grub2/custom.cfg</"
+#~ "filename> or use the software <application>grub-customizer</application> "
+#~ "tool instead (available in the Mageia repositories)."
+#~ msgstr ""
+#~ "为此，您需要手动编辑 /boot/grub2/custom.cfg，或者使用 grub-customizer（可"
+#~ "以从 Mageia 仓库中安装）来编辑引导项。"
+
+#, fuzzy
+#~ msgid ""
+#~ "For more information, see: <link ns4:href=\"https://wiki.mageia.org/en/"
+#~ "Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
+#~ "link>"
+#~ msgstr ""
+#~ "有关更多信息，请参考我们的 wiki：<link ns2:href=\"https://wiki.mageia.org/"
+#~ "en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-"
+#~ "efi_and_Mageia</link>"
+
+#, fuzzy
+#~ msgid ""
 #~ "<imageobject> <imagedata fileref=\"live-bootCSM.png\" align=\"center\"/> "
 #~ "</imageobject>"
 #~ msgstr ""