Update Installer translations

1 files changed, 3135 insertions, 2128 deletions

diff --git a/docs/docs/stable/installer/zh_CN.po b/docs/docs/stable/installer/zh_CN.po
index 0ae89847..1c8681db 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: 2018-04-19 16:32+0300\n"
+"POT-Creation-Date: 2019-01-06 12:43+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/"
@@ -27,12 +27,12 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. type: Content of: <section><info><title>
-#: en/acceptLicense.xml:25
+#: en/acceptLicense.xml:31
 msgid "License and Release Notes"
 msgstr "许可证和发行说明"
 
 #. type: Content of: <section><mediaobject>
-#: en/acceptLicense.xml:29
+#: en/acceptLicense.xml:35
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
@@ -48,79 +48,85 @@ msgstr ""
 "\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:40
+#: en/acceptLicense.xml:46
 msgid "License Agreement"
 msgstr "许可协议"
 
-#. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:43
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/acceptLicense.xml:51
+#, fuzzy
 msgid ""
-"Before installing <application>Mageia</application>, please read the license "
-"terms and conditions carefully."
+"Before installing Mageia, please read the license terms and conditions "
+"carefully."
 msgstr ""
 "在安装 <application>Mageia</application> 之前，请先仔细阅读许可条款和许可条"
 "件。"
 
-#. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:46
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/acceptLicense.xml:56
+#, fuzzy
 msgid ""
-"These terms and conditions apply to the entire <application>Mageia</"
-"application> distribution and must be accepted before you can continue."
+"These terms and conditions apply to the entire Mageia distribution and must "
+"be accepted before you can continue."
 msgstr ""
 "这些许可条款和许可条件适用于整个 <application>Mageia</application> 发行版，你"
 "必须予以接受才能继续安装。"
 
-#. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:50
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/acceptLicense.xml:61
 #, fuzzy
 msgid ""
-"To proceed, simply select <guilabel>Accept</guilabel> and then click on "
-"<guibutton>Next</guibutton>."
+"To proceed, simply select <emphasis>Accept</emphasis> and then click on "
+"<emphasis>Next</emphasis>"
 msgstr ""
 "要接受, 只要选择 <guilabel>接受</guilabel> 后点击 <guibutton>下一步</"
 "guibutton>."
 
 #. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:53
+#: en/acceptLicense.xml:66
+#, fuzzy
 msgid ""
-"If you decide not to accept these conditions, then we thank you for looking. "
-"Clicking <guibutton>Quit</guibutton> will reboot your computer."
+"If you decide not to accept these conditions, then we thank you for your "
+"interest in Mageia. Clicking <emphasis>Quit</emphasis> will reboot your "
+"computer."
 msgstr ""
 "若你不希望接受这些条件，我们向您表示诚挚歉意。请点击 <guibutton>退出</"
 "guibutton> 来重启计算机。"
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:63
+#: en/acceptLicense.xml:76
 msgid "Release Notes"
 msgstr "发行说明"
 
 #. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:70
+#: en/acceptLicense.xml:83
 #, fuzzy
 msgid ""
-"Important information about this release of <application>Mageia</"
-"application> can be viewed by clicking on the <guibutton>Release Notes</"
-"guibutton> button."
+"Important information about this particular Mageia release can be viewed by "
+"clicking on the <emphasis>Release Notes</emphasis> button."
 msgstr ""
 "有关此 Mageia 发布版本的重要信息，可以通过点击 <guibutton>发行说明</"
 "guibutton> 来阅读。"
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
-#: en/DrakX-cover.xml:1 en/DrakX.xml:1 en/media_selection.xml:1
+#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:2
+#: en/DrakX-cover.xml:3 en/DrakX.xml:3 en/media_selection.xml:2
 msgid "en"
 msgstr "zh_CN"
 
 #. type: Content of: <section><info><title>
 #: en/add_supplemental_media.xml:3
-msgid "Media Selection (Configure Supplemental Installation Media)"
+#, fuzzy
+msgid "Supplemental Installation Media"
 msgstr "介质选择 (设置增补的安装介质)"
 
 #.  papoteur 2013-04-13  - created 
 #.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection 
 #.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell 
+#. 2018/02/10 apb: Text and typgraphy.
+#. 2018/02/16 apb: Update dx2-add_supplemental_media.png to Mga6
 #. type: Content of: <section><mediaobject>
-#: en/add_supplemental_media.xml:14
+#: en/add_supplemental_media.xml:18
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
@@ -132,70 +138,77 @@ msgstr ""
 "add_supplemental_media-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:19
+#: en/add_supplemental_media.xml:23
 #, fuzzy
 msgid ""
-"This screen shows you the list of already recognized repositories. You can "
-"add other sources for packages, like an optical disc or a remote source.  "
+"This screen shows you the list of already recognised repositories. You can "
+"add other sources for packages, like an optical-disc or a remote source.  "
 "The source selection determines which packages will be available during the "
-"next steps."
+"subsequent steps."
 msgstr ""
 "此窗口中列出了已识别的软件仓库。你可以添加其他的软件源，如光盘或远程资源。所"
 "选的源将决定下一步中哪些软件包可用于安装。"
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:24
+#: en/add_supplemental_media.xml:28
 msgid "For a network source, there are two steps to follow:"
 msgstr "如果需要获取网络资源，请执行以下两步："
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:28
-msgid "Choosing and activation of the network, if not already up."
+#: en/add_supplemental_media.xml:32
+#, fuzzy
+msgid "Choosing and activating the network, if not already up."
 msgstr "若尚未启用网络链接，请选择并启用它。"
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:32
+#: en/add_supplemental_media.xml:36
 #, fuzzy
 msgid ""
 "Selecting a mirror or specifying a URL (very first entry). By selecting a "
 "mirror, you have access to the selection of all repositories managed by "
-"Mageia, like the <emphasis role=\"bold\">Nonfree</emphasis>, the <emphasis "
-"role=\"bold\">Tainted</emphasis> repositories and the <emphasis role=\"bold"
-"\">Updates</emphasis>. With the URL, you can designate a specific repository "
-"or your own NFS installation."
+"Mageia, like the <emphasis>Nonfree</emphasis>, the <emphasis>Tainted</"
+"emphasis> repositories and the <emphasis>Updates</emphasis>. With the URL, "
+"you can designate a specific repository or your own NFS installation."
 msgstr ""
 "选择一个镜像，或指定 URL（第一个选项）。若选择了镜像，则您需要能够访问所选择"
 "的所有仓库（由 Mageia 管理，例如 Nonfree、Tainted 和 Updates）。若指定了 "
 "URL，则可以使用特定的仓库或您的个人 NFS。"
 
 #. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:42
+#: en/add_supplemental_media.xml:46
 #, fuzzy
 msgid ""
-"If you are updating a 64 bit installation which may contain some 32 bit "
+"If you are updating a 64-bit installation which may contain some 32-bit "
 "packages, it is advised to use this screen to add an online mirror by "
-"ticking one of the Network protocols here. The 64-bit DVD ISO only contains "
-"64-bit and noarch packages, it will not be able to update the 32-bit "
-"packages. However, after adding an online mirror, the installer will find "
-"the needed 32-bit packages there."
+"selecting one of the Network protocols here. The 64-bit DVD ISO only "
+"contains 64-bit and <emphasis>noarch</emphasis> packages, it will not be "
+"able to update the 32-bit packages. However, after adding an online mirror, "
+"the installer will find the needed 32-bit packages there."
 msgstr ""
 "若您整从包含 32 位软件包的版本升级到 64 位，我们建议您使用此窗口添加在线镜像"
 "（勾选一个网络协议）。64 位 DVD iso 仅包含 64 位软件包和非特定架构的软件包。"
 "若添加了在线镜像，则所需 32 位软件包也会被显示在这里。"
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
-msgid "User and Superuser Management"
-msgstr "用户和管理员管理"
+#: en/addUser.xml:9
+#, fuzzy
+msgid "User Management"
+msgstr "高级用户管理"
 
 #.  Lebarhon: 20170210 updated for Mageia 6 (umask)
+#. 2018/02/12 apb: Text and Typography.
+#. 2018/02/19 apb: Update dx2-setRootPassword.png to Mga6.
+#. 2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
+#.   Also changed 'Advanced User Management' to 'User Management (advanced)'.
+#. 2018/02/24 apb: Changed list style.
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:9
+#: en/addUser.xml:24
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata fileref="
+"\"live-user1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -203,21 +216,21 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:20
+#: en/addUser.xml:36
 msgid "Set Administrator (root)  Password:"
 msgstr "设置管理员（root 账户）密码："
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:40
 #, fuzzy
 msgid ""
-"It is advisable for all <application>Mageia</application> installations to "
-"set a <emphasis role=\"bold\">superuser</emphasis> (administrator) password, "
-"usually called the <emphasis>root password</emphasis> in Linux. As you type "
-"a password into the top box a shield will change from red to yellow to green "
-"depending on the strength of the password. A green shield shows you are "
-"using a strong password. You need to repeat the same password in the box "
-"underneath, to check that the first entry was not mistyped."
+"It is advisable for all Mageia installations to set a <literal>superuser</"
+"literal> (Administrator) password, usually called the <emphasis>root </"
+"emphasis>password in Linux. As you type a password into the top box a shield "
+"will change from red-to-yellow-to-green depending on the strength of the "
+"password. A green shield shows you are using a strong password. You need to "
+"repeat the same password in the box underneath, to check that the first "
+"entry was not mistyped."
 msgstr ""
 "我们建议任何时候安装 <application>Mageia</application> 都设置一个超级用户或管"
 "理员密码（Linux 中一般叫做 root 密码）。当你在顶部输入框中输入密码时，盾的颜"
@@ -225,89 +238,110 @@ msgstr ""
 "较高。你需要在下方输入框中再次输入相同的密码，以确保你之前的密码没有输错。"
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:34
+#: en/addUser.xml:49
 #, fuzzy
 msgid ""
-"All passwords are case sensitive. It is best to use a mixture of letters "
+"All passwords are case-sensitive. It is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
 msgstr ""
 "所有的密码都区分大小写。建议在密码中混合使用字母（大写和小写）、数字和其他字"
 "符。"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:57
 msgid "Enter a user"
 msgstr "输入用户名"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:45
+#: en/addUser.xml:60
 #, fuzzy
 msgid ""
-"Add a user here. A regular user has fewer privileges than the <emphasis role="
-"\"bold\">superuser</emphasis> (root), but enough to use the internet, office "
-"applications or play games and anything else the average user might use "
-"their computer for."
+"Add a User here. A regular user has fewer privileges than the "
+"<literal>superuser</literal> (root), but enough to use the Internet, office "
+"applications or play games and anything else the average user might use a "
+"computer for."
 msgstr ""
 "在这里添加一个用户。一个用户拥有比超级管理员更少的权限，但是网上冲浪，使用办"
 "公软件或者玩游戏等是足够的。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
-msgid ""
-"<guibutton>Icon</guibutton>: if you click on this button it will change the "
-"user's icon."
+#: en/addUser.xml:67
+#, fuzzy
+msgid "<emphasis role=\"bold\">Icon</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/addUser.xml:69
+#, fuzzy
+msgid "Click on this button if you want to change the user's icon"
 msgstr "<guibutton>图标</guibutton>：若点击此按钮，则会改变用户图标。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
-msgid ""
-"<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
-"box."
+#: en/addUser.xml:74
+#, fuzzy
+msgid "<emphasis role=\"bold\">Real Name</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/addUser.xml:76
+#, fuzzy
+msgid "Insert the user's real name into this text box"
 msgstr "<guilabel>真实姓名</guilabel>：在文本框中输入用户的真名。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:62
+#: en/addUser.xml:80
+#, fuzzy
+msgid "<emphasis role=\"bold\">Login Name</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/addUser.xml:82
 #, fuzzy
 msgid ""
-"<guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use "
-"a version of the user's real name. <emphasis role=\"bold\">The login name is "
-"case sensitive.</emphasis>"
+"Enter the user login name or let DrakX use a version of the user's real "
+"name. <emphasis role=\"bold\">The login name is case-sensitive.</emphasis>"
 msgstr ""
 "<guilabel>登录名</guilabel>：输入用户的登录名，或让 drakx 根据真实姓名自动设"
 "置。<emphasis>登录名区分大小写。</emphasis>"
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/addUser.xml:88 en/setupBootloader.xml:87
+#, fuzzy
+msgid "<emphasis role=\"bold\">Password</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
+
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:67
+#: en/addUser.xml:90
 #, fuzzy
 msgid ""
-"<guilabel>Password</guilabel>: Type in the user password. There is a shield "
-"at the end of the text box that indicates the strength of the password. (See "
-"also <xref linkend=\"givePassword\"/>)"
+"Type in the user password. There is a shield at the end of the text box that "
+"indicates the strength of the password. (See also <xref linkend="
+"\"givePassword\"/>)"
 msgstr ""
 "<guilabel>密码</guilabel>：在此文本框中输入用户密码。后面的盾牌图标将会指示密"
 "码强度。（参见 <xref linkend=\"givePassword\"/>）"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:73
+#: en/addUser.xml:94
 #, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the user password DrakX will "
-"check that you have not mistyped the password."
+"<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
+"password. DrakX will check that you have not mistyped the password."
 msgstr ""
 "<guilabel>确认密码</guilabel>：再次输入密码，安装程序将检查您两次输入的密码是"
 "否一致。"
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:101
 #, fuzzy
 msgid ""
-"Any users you added while installing Mageia, will have a home directory that "
-"is both read and write protected (umask=0027)."
+"Any users added while installing Mageia, will have a home directory that is "
+"both read and write protected (umask=0027)"
 msgstr ""
 "在安装 Mageia 期间添加的任何用户都将拥有读/写保护的主目录（即 umask=0027）。"
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:82
+#: en/addUser.xml:104
 #, fuzzy
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
@@ -318,57 +352,57 @@ msgstr ""
 "<emphasis>用户管理</emphasis>即可。"
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:86
+#: en/addUser.xml:108
 msgid "The access permissions can also be changed after the install."
 msgstr "也可以在安装完成后改变访问权限。"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:93
-msgid "Advanced User Management"
+#: en/addUser.xml:115
+#, fuzzy
+msgid "User Management (advanced)"
 msgstr "高级用户管理"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:96
+#: en/addUser.xml:118
 #, fuzzy
 msgid ""
-"The <guibutton>Advanced</guibutton> option allows you to edit further "
-"settings for the user you are adding."
+"The <emphasis>Advanced</emphasis> option allows you to edit further settings "
+"for the user you are adding."
 msgstr ""
 "若点击<guibutton>高级</guibutton>按钮，您可以在弹出的窗口中对所添加的用户进行"
 "设置。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:123
 #, fuzzy
 msgid ""
-"<guilabel>Shell</guilabel>: This drop-down list allows you to change the "
+"<emphasis>Shell</emphasis>: This drop-down list allows you to change the "
 "shell available to any user you added in the previous screen. Options are "
-"<emphasis role=\"bold\">Bash</emphasis>, <emphasis role=\"bold\">Dash</"
-"emphasis> and <emphasis role=\"bold\">Sh</emphasis>"
+"<literal>Bash</literal>, <literal>Dash</literal> and <literal>Sh</literal>"
 msgstr ""
 "<guilabel>Shell</guilabel>：可以在下列列表中选择用户所使用的 shell（在上一步"
 "中添加），可能的选项有 Bash、Dash 和 Sh。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:107
+#: en/addUser.xml:130
 #, fuzzy
 msgid ""
-"<guilabel>User ID</guilabel>: Here you can set the <emphasis role=\"bold"
-"\">user ID</emphasis> for any user you added in the previous screen. If you "
-"are unsure what the purpose of this is, then leave it blank."
+"<emphasis>User ID</emphasis>: Here you can set the user ID for any user you "
+"added in the previous screen. If you are unsure what the purpose of this is, "
+"then leave it blank."
 msgstr ""
 "<guilabel>用户 ID</guilabel>：这里您可以设置之前所添加的用户的 ID（数值）。若"
 "您不确定如何设置，请将其留空。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:113
+#: en/addUser.xml:136
 msgid ""
-"<guilabel>Group ID</guilabel>: This lets you set the <emphasis role=\"bold"
-"\">group ID</emphasis>. Again, if unsure, leave it blank."
+"<emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if "
+"unsure, leave it blank."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:3
+#: en/ask_mntpoint_s.xml:10
 msgid "Choose the mount points"
 msgstr "选择挂载点"
 
@@ -383,16 +417,17 @@ msgstr "选择挂载点"
 #.        write "it's type". And you're right about the redundant part, too, I removed it
 #.  And JohnR says the Americans are WRONG! :-)) 
 #.  2012-04-19  Language proofreading done 
+#. 2018/02/12 apb: Text and typography.
+#. 2019/01/04 apb: Typo & minor reword on custom mount-points.
 #. type: Content of: <section><mediaobject>
-#: en/ask_mntpoint_s.xml:27
+#: en/ask_mntpoint_s.xml:38
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
-"\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
-"png\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata format=\"PNG\" fileref=\"live-chooseMountpoints.png\" align="
-"\"center\" xml:id=\"live-chooseMountPoints-im1\" revision=\"1\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-chooseMountpoints.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"chooseMountPoints-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-chooseMountpoints.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"live-chooseMountPoints-im1\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
@@ -402,52 +437,36 @@ msgstr ""
 "im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:36
+#: en/ask_mntpoint_s.xml:49
+#, fuzzy
 msgid ""
 "Here you see the Linux partitions that have been found on your computer. If "
-"you don't agree with the <application>DrakX</application> suggestions, you "
-"can change the mount points."
+"you don't agree with the DrakX suggestions, you can change the mount points "
+"yourself."
 msgstr ""
 "这里你可以查看已找到的 Linux 分区。如果 <application>DrakX</application> 的建"
 "议不合适，你可以手动更改挂载点。"
 
-#. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:41
-#, fuzzy
-msgid ""
-"If you change anything, make sure you still have a <emphasis role=\"bold"
-"\"><literal>/</literal></emphasis> (root) partition."
-msgstr ""
-"如果进行了更改，请确保你仍然具有访问 <literal>/</literal> （根）分区的权限。"
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:46
-#, fuzzy
-msgid ""
-"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
-"(capacity, mount point, type).</emphasis>"
-msgstr "所有分区的属性将按下列顺序显示：“设备名”（“容量”，“挂载点”，“类型”）。"
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:50
+#: en/ask_mntpoint_s.xml:55
 msgid ""
-"<emphasis role=\"bold\">Device</emphasis>, is made up of: <emphasis role="
-"\"bold\">hard drive</emphasis>, [<emphasis role=\"bold\">hard drive name</"
-"emphasis> (letter)], <emphasis role=\"bold\">partition number</emphasis> "
-"(for example, <emphasis role=\"bold\">sda5</emphasis>)."
+"To the left of the drop-down menus is a list of available partitions. For "
+"example: <filename>sda</filename> is a hard drive - and <filename>5</"
+"filename> is a <emphasis>partition number</emphasis>, followed by "
+"the<emphasis> (capacity, mount point, filesystem type)</emphasis> of the "
+"partition."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:56
+#: en/ask_mntpoint_s.xml:63
 #, fuzzy
 msgid ""
-"If you have several partitions, you can choose various different mount "
-"points from the drop down menu, such as <emphasis role=\"bold\">/</"
-"emphasis>, <emphasis role=\"bold\"><literal>/home</literal></emphasis> and "
-"<emphasis role=\"bold\">/var</emphasis>. You can even make your own mount "
-"points, for instance <emphasis role=\"bold\"><literal>/video</literal></"
-"emphasis> for a partition where you want to store your films, or <emphasis "
-"role=\"bold\">/Data</emphasis> (or some other name) for your data."
+"If you have several partitions, you can choose various different "
+"<emphasis>mount points</emphasis> from the drop down menu, such as "
+"<filename>/</filename>, <filename>/home</filename> and <filename>/var</"
+"filename>. You can even make your own mount points, for instance <filename>/"
+"video</filename> for a partition where you want to store your films, or "
+"perhaps <filename>/Data</filename> for all your data files."
 msgstr ""
 "如果存在多个分区，你可以从下列列表中选择不同的挂载点来使用，例如 <literal>/</"
 "literal>、<literal>/home</literal> 和 <literal>/var</literal>。也可以自定义挂"
@@ -455,7 +474,7 @@ msgstr ""
 "home</literal> 用于 cauldron 系统的用户主目录。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:63
+#: en/ask_mntpoint_s.xml:73
 #, fuzzy
 msgid ""
 "For any partitions that you don't need to make use of, you can leave the "
@@ -463,297 +482,419 @@ msgid ""
 msgstr "对于非必需的分区，挂载点一项可以留空。"
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:79
+#, fuzzy
+msgid ""
+"If you make any changes here, ensure you still have a <filename>/</filename> "
+"(root) partition."
+msgstr ""
+"如果进行了更改，请确保你仍然具有访问 <literal>/</literal> （根）分区的权限。"
+
+#. type: Content of: <section><tip><para>
+#: en/ask_mntpoint_s.xml:84
 #, fuzzy
 msgid ""
-"If you are not sure what to choose, click <emphasis role=\"bold\">Previous</"
-"emphasis> to go back and then tick <guilabel>Custom disk partitioning</"
-"guilabel>, where, you can click on a partition to see its type and size."
+"If you are not sure what to choose, click <emphasis>Previous</emphasis> to "
+"go back and then tick <emphasis>Custom disk partitioning</emphasis>, where "
+"you can click on a partition to see its type and size."
 msgstr ""
 "如果不确定如何选择，请点击 <guibutton>上一步</guibutton> 按钮，然后点击 "
 "<guilabel>自定义磁盘分区</guilabel>，在出现的窗口中点击分区来查看其类型和大"
 "小。"
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:74
+#: en/ask_mntpoint_s.xml:90
+#, fuzzy
 msgid ""
-"If you are sure the mount points are correct, click on <guibutton>Next</"
-"guibutton>, and choose whether you only want to format the partition(s) "
-"DrakX suggests, or more."
+"If you are sure the mount points are correct, click on <emphasis>Next</"
+"emphasis>, and choose whether you only want to format the partition "
+"suggested by DrakX, or more."
 msgstr ""
 "若确定挂载点设置正确，则可点击 <guibutton>下一步</guibutton>，并确定是否根据 "
 "DrakX 的建议格式化分区等。"
 
 #. type: Content of: <section><info><title>
-#: en/bestTime.xml:10
-msgid "Clock settings"
+#: en/bestTime.xml:5
+#, fuzzy
+msgid "Clock Settings"
 msgstr "时钟设置"
 
 #. type: Content of: <section><mediaobject>
-#: en/bestTime.xml:14
+#: en/bestTime.xml:8
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"live-"
+"bestTime.png\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
 "format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/bestTime.xml:20
+#: en/bestTime.xml:12
+#, fuzzy
 msgid ""
-"In this step, you have to select on which time your internal clock is set, "
-"either local time or UTC time."
+"Here, you can select whether your computer internal clock is set to local "
+"time or UTC time."
 msgstr "在这一步中，你需要选择内部时钟的计时方式（本地时间或 UTC 时间）。"
 
 #. type: Content of: <section><para>
-#: en/bestTime.xml:23
-msgid "In advanced tab, you will find more options about clock settings."
-msgstr "在高级选项卡中，你可以找到更多有关时钟设置的选项。"
+#: en/bestTime.xml:14
+msgid ""
+"In the <emphasis>Advanced</emphasis> tab, you can enable automatic time "
+"synchronization and specify an NTP server."
+msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:1
+#: en/bootLive.xml:6
 msgid "Boot Mageia as Live system"
 msgstr "引导 Mageia Live 系统"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:1
+#: en/bootLive.xml:10
 msgid "Booting the medium"
 msgstr "引导媒体"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:1
-msgid "From a disc"
-msgstr "自磁盘"
-
-#. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:1
+#. type: Content of: <section><section><para>
+#: en/bootLive.xml:12
 msgid ""
-"You can boot directly from the media you used to burn your image (CD-ROM, "
-"DVD-ROM...). You usually just need to insert it in your CD/DVD drive for the "
-"bootloader to launch the installation automatically after rebooting the "
-"computer. If that does not happen you may need to reconfigure your BIOS or "
-"press one key that will offer you to choose the peripheral from which the "
-"computer will boot."
+"You can boot directly from a Live DVD or USB. Usually, you just need to plug "
+"the USB device in or place the DVD in the drive and restart the computer."
 msgstr ""
-"可以使用刻录的镜像（CD-ROM，DVD-ROM等）直接引导 Mageia。只需将媒体插入到光盘"
-"驱动器中，然后重启电脑即可。若没有出现引导画面，则需要手动修改 BIOS 配置，或"
-"者在电脑启动时按下特定按键来选择引导设备。"
 
-#. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:6
+#. type: Content of: <section><section><para>
+#: en/bootLive.xml:15
 msgid ""
-"According to which hardware you have, and how it is configured, you get "
-"either one or another of the two screens below."
-msgstr "根据你所使用的硬件以及配置的不同，接下来还有一些安装选项需要设置。"
+"If the computer does not automatically boot from the USB or DVD you may need "
+"to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
+"accessing the boot device menu to select a device from which the computer "
+"will boot."
+msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:7
-msgid "From a USB device"
-msgstr "自 USB 设备"
+#. type: Content of: <section><section><tip><para>
+#: en/bootLive.xml:20
+msgid ""
+"To access the BIOS or boot menu when the computer is starting, you can try "
+"pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or <keycap>Esc</"
+"keycap> for the BIOS, or <keycap>Esc</keycap>, <keycap>F8</keycap>, "
+"<keycap>F10</keycap> or <keycap>F11</keycap> for the boot device menu. These "
+"(fairly common) keys are just a selection of possible options though."
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:7
+#. type: Content of: <section><section><note><para>
+#: en/bootLive.xml:28
 msgid ""
-"You can boot from the USB device on which you dumped your image ISO. "
-"According to your BIOS settings, the computer boots perhaps directly on the "
-"USB device already plugged in a port. If that does not happen you may need "
-"to reconfigure your BIOS or press one key that will offer you to choose the "
-"peripheral from which the computer will boot."
+"The actual screen that you will first see when booting from the Live media "
+"will depend on whether your computer motherboard is of the Legacy (BIOS) or "
+"UEFI type."
 msgstr ""
-"你可以通过写有镜像 ISO 的 USB 设备来引导 Mageia。根据 BIOS 设置不同，电脑可能"
-"直接从插入的 USB 设备上启动，也可能跳过 USB 设备。在后一种情况下，你需要手动"
-"修改 BIOS 配置，或在电脑启动时按下特定按键来选择引导设备。"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:12
+#: en/bootLive.xml:35
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "在 BIOS/CSM/Legacy 模式下"
 
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/bootLive.xml:38
+msgid "Main Menu"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:40 en/bootLive.xml:152
+#, fuzzy
+msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:41
+msgid ""
+"This option will boot the Mageia Live system from the connected DVD/USB "
+"media (expect a very slow system compared to an installed OS)."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:42
+#, fuzzy
+msgid "Once the boot is done, you can proceed to the installation."
+msgstr "此处您的配置将保留并用于安装过程。"
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:45 en/bootLive.xml:57
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
+"emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:47
+msgid "Boot the Mageia Live system using non-free video drivers"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:53 en/bootLive.xml:156 en/installer.xml:65
+#, fuzzy
+msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:54 en/bootLive.xml:157
+#, fuzzy
+msgid "This option will install Mageia to a hard disk."
+msgstr "Install Mageia：将 Mageia 直接安装到硬盘。"
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:59
+msgid "Install Mageia using non-free video drivers"
+msgstr ""
+
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:12
-msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
+#: en/bootLive.xml:65
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-bootCSM.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:12
+#: en/bootLive.xml:69
 msgid "First screen while booting in BIOS mode"
 msgstr "在 BIOS 模式下引导时的第一个画面"
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:12
-msgid "In the middle menu, you have the choice between three actions:"
-msgstr "中间的菜单提供了三个可选操作："
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/bootLive.xml:73
+msgid "Function Keys"
+msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:13
+#: en/bootLive.xml:75
+#, fuzzy
+msgid "<keycap>F1</keycap> <emphasis role=\"bold\">Help</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:76
 msgid ""
-"Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD "
-"or USB stick) without writing anything on the disk, so expect a very slow "
-"system. Once the boot is done, you can proceed to the installation on a hard "
-"disk."
+"Within any of the <keycap>F2</keycap> to <keycap>F6</keycap> options, you "
+"can view relevant help by pressing <keycap>F1</keycap>."
 msgstr ""
-"Boot Mageia：将从媒体（CD/DVD 或 U 盘）直接启动 Mageia 5，并且不会向硬盘写入"
-"任何数据，所以系统可能运行较慢。引导完成后，即可将系统安装到硬盘。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:16
-msgid ""
-"Install Mageia: This choice will directly install Mageia on a hard disk."
-msgstr "Install Mageia：将 Mageia 直接安装到硬盘。"
+#: en/bootLive.xml:81
+#, fuzzy
+msgid "<keycap>F2</keycap> <emphasis role=\"bold\">Language</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:17
+#: en/bootLive.xml:82
 msgid ""
-"Boot from hard disk: This choice allows to boot from hard disk, as usual, "
-"when no media (CD/DVD or USB stick) is connected. (not working with Mageia "
-"5)."
+"Press <keycap>F2</keycap> to have the installer use a specific language "
+"during the installation. Use the arrow keys to select the language then "
+"press <keycap>Enter</keycap>."
 msgstr ""
-"Boot from hard disk：从硬盘引导，和不使用引导媒体的情况相同（即不启动 Mageia "
-"5）。"
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:19
-msgid "In the bottom menu, are the Boot Options:"
-msgstr "底部菜单中提供了引导选项："
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:87
+#, fuzzy
+msgid "<keycap>F3</keycap> <emphasis role=\"bold\">Video Mode</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:19
+#: en/bootLive.xml:89
+#, fuzzy
 msgid ""
-"F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
-msgstr "F1 - 帮助。说明”splash“、”apm“、”acpi“、”ide“等选项。"
+"If needed, change the screen resolution by pressing <keycap>F3</keycap>. "
+"Options are: 640x480, 800x600, 1024x768."
+msgstr "按 F3 键可以更改屏幕分辨率（仅用于传统模式）。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:20
-msgid "F2 - Language. Choose the display language of the screens."
-msgstr "F2 - 语言。选择用于显示的语言。"
+#: en/bootLive.xml:93
+#, fuzzy
+msgid "<keycap>F4</keycap> <emphasis role=\"bold\">Source</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:21
-msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
-msgstr "F3 -屏幕分辨率。选择 640x400、800x600、1024x728 或纯文本模式。"
+#: en/bootLive.xml:94
+msgid ""
+"Normally, the installation is performed from the inserted installation "
+"medium. Here, you may select other sources, like FTP or NFS servers."
+msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:22
+#: en/bootLive.xml:95
+#, fuzzy
 msgid ""
-"F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from "
-"the inserted installation medium. Here, select other sources, like FTP or "
-"NFS servers. If the installation is carried out in a network with an SLP "
-"server, select one of the installation sources available on the server with "
-"this option."
+"If the installation is carried out in a network with an SLP server, then "
+"select one of the installation sources available on the server with this "
+"option."
 msgstr ""
 "F4 - CD-Rom。CD-Rom 相关选项。一般通过插入的安装媒体来安装，但也可以选择 "
 "FTP、NFS 等其他安装源。如果通过网络上的 SLP 服务器来安装，请用此选项选择一个"
 "服务器上可用的安装源。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:26
+#: en/bootLive.xml:98
+#, fuzzy
+msgid "<keycap>F5</keycap> <emphasis role=\"bold\">Driver</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:99
 msgid ""
-"F5 - Driver. Yes or No. The system is aware about the presence of an "
-"optional disk with a driver update and will require its insertion during "
-"installation process."
+"If you have a driver update that you wish to use, select this option and "
+"then answer <emphasis>Yes</emphasis>. You will be prompted to insert the "
+"update disc at the appropriate time."
 msgstr ""
-"F5 - 驱动。是否使用驱动。系统将在安装过程中提醒需要使用驱动更新的磁盘，并将其"
-"插入。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:104
+#, fuzzy
+msgid "<keycap>F6</keycap> <emphasis role=\"bold\">Kernel Options</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:106
+msgid ""
+"If you experience problems with the installation, you could try modifying "
+"the default settings using the <emphasis>Kernel Option</emphasis> menu:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:111
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">Default:</emphasis> splash quiet noiswmd resume "
+"audit=0"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:114
+msgid ""
+"<emphasis role=\"bold\">Safe Settings:</emphasis> <literal>apm=off acpi=off "
+"mce=off barrier=off ide=nodma idewait=50 i8042.nomux psmouse.proto=bare "
+"irqpoll pci=nommconf</literal>"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:120
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">No ACPI:</emphasis> (Advanced Configuration and "
+"Power Interface): Power management features are not used."
+msgstr "- 无 ACPI（高级配置与电源接口），不使用电源管理功能"
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:125
+#, fuzzy
 msgid ""
-"F6 - Kernel options. This is a way to specify options according to your "
-"hardware and the drivers to use."
-msgstr "F6 - 内核选项。用于指定与硬件和驱动相关的内核参数。"
+"<emphasis role=\"bold\">No Local APIC:</emphasis> (Local Advanced "
+"Programmable Interrupt Controller): CPU interrupt. Select this option if you "
+"experience system misbehaviour like a kernel panic in relation to APIC."
+msgstr ""
+"- 无本地 APIC（本地高级可编程终端控制器）。若您不需要控制 CPU 中断，可以选择"
+"此选项"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:131
+msgid ""
+"If you open any of the above <keycap>F6</keycap> menu items, and then click "
+"on <keycap>F1</keycap>, an info window will open to show more details for "
+"that particular item:"
+msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:139
 msgid "In UEFI mode"
 msgstr "在 UEFI 模式下"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:142
+#, fuzzy
 msgid ""
-"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
-"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"live-bootUEFI.png\" align="
+"\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
 "align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:29
-msgid "First screen while booting on UEFI system from disk"
-msgstr "在 UEFI 模式下引导时的第一个画面"
+#: en/bootLive.xml:146
+#, fuzzy
+msgid "First screen while booting in UEFI mode"
+msgstr "在 BIOS 模式下引导时的第一个画面"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:29
-msgid ""
-"You have only the choice to run Mageia in Live mode (first choice)  or to "
-"process the installation (second choice)."
+#: en/bootLive.xml:149
+msgid "In UEFI mode, you have just the two menu options to choose from:"
 msgstr ""
-"你可以选择以 Live 模式运行 Mageia（第一个选项）或者直接进行安装（第二个选"
-"项）。"
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:30
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:153
+#, fuzzy
 msgid ""
-"If you booted from a USB stick, you get two supplemental lines which are a "
-"duplicata of the previous lines suffixed with \"USB\". You have to choose "
-"them."
-msgstr "若从 U 盘引导，除了以”uSB“结尾的行以外，还会有额外的两行供选择。"
+"This option will boot the Mageia Live system from the connected Dvd/USB "
+"media (expect a very slow system compared to an installed OS). Once the boot "
+"is done, you can proceed to the installation"
+msgstr ""
+"Boot Mageia：将从媒体（CD/DVD 或 U 盘）直接启动 Mageia 5，并且不会向硬盘写入"
+"任何数据，所以系统可能运行较慢。引导完成后，即可将系统安装到硬盘。"
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:32
+#. type: Content of: <section><section><note><para>
+#: en/bootLive.xml:161
 msgid ""
-"In each case, the first steps will be the same to choose language, timezone "
-"and keyboard, then the processes differ, with <link linkend=\"testing"
-"\">additional steps in Live mode</link>."
+"If you booted from a USB stick, you will see the above menu options "
+"duplicated, and in this case, you should choose from the menu pair that will "
+"be suffixed with \"USB\"."
 msgstr ""
-"在不同选项中，都需要先选择语言、时区和键盘布局，然后 <link linkend=\"testing"
-"\">Live 模式下会有额外的步骤</link>。"
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:3
+#: en/chooseDesktop.xml:16
 msgid "Desktop Selection"
 msgstr "桌面环境选择"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:8
-#, fuzzy
-msgid ""
-"Depending on your selection here, you may be offered further screens to fine-"
-"tune your choice."
-msgstr "根据所选项不同，随后会出现不同的窗口用于详细设置。"
+#: en/chooseDesktop.xml:23
+msgid "Some choices made here will open other screens with related options."
+msgstr ""
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
+#: en/chooseDesktop.xml:26
 #, fuzzy
 msgid ""
-"After the selection step(s), you will see a slide-show during package "
-"installation. The slide show can be disabled by pressing the "
-"<guilabel>Details</guilabel> button"
+"After the selection step(s), you will see a slideshow during the "
+"installation of required packages. The slideshow can be disabled by pressing "
+"the <emphasis>Details</emphasis> button."
 msgstr ""
 "在选择完成之后，将会在安装软件包时展示一系列幻灯片。可以按 <guilabel>详细</"
 "guilabel> 按钮来关闭幻灯片显示。"
 
 #. type: Content of: <section><mediaobject>
-#: en/chooseDesktop.xml:16
+#: en/chooseDesktop.xml:31
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
-"align=\"center\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-chooseDesktop.png\" "
+"format=\"PNG\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
 "align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><para>
-#: en/chooseDesktop.xml:21
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/chooseDesktop.xml:38
+msgid ""
+"Choose whether you prefer to use the KDE Plasma or GNOME desktop "
+"environment. Both come with a full set of useful applications and tools."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/chooseDesktop.xml:44
 #, fuzzy
 msgid ""
-"Choose whether you prefer to use the <application>KDE</application> "
-"<emphasis role=\"bold\">Plasma</emphasis> or <application>GNOME</"
-"application> desktop environment. Both come with a full set of useful "
-"applications and tools. Tick <guilabel>Custom</guilabel> if you wish to use "
-"neither (or even use both), or if you want to modify the default software "
-"choices for these desktop environments. The <application>LXDE</application> "
-"desktop, for instance, is lighter than the previous two, sporting less eye "
-"candy and fewer packages installed by default."
+"Select <emphasis>Custom</emphasis> if you do not wish to use either (or, "
+"actually use both) of these, or if you want to modify the default software "
+"choices for these desktop environments. The LXDE desktop, for instance, is "
+"lighter than the previous two, sporting less eye candy and having fewer "
+"packages installed by default."
 msgstr ""
 "请选择 <application>KDE</application> 或 <application>GNOME</application> 作"
 "为桌面环境。这两种环境均包含有用的应用程序盒工具。若希望全部安装或均不安装，"
@@ -767,8 +908,9 @@ msgid "Package Group Selection"
 msgstr "选择软件包组"
 
 #. Lebarhon 20170209 Updated SC
+#. 2018/02/25 apb: add xreflabel to this section.
 #. type: Content of: <section><mediaobject>
-#: en/choosePackageGroups.xml:9
+#: en/choosePackageGroups.xml:11
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
 "\" align=\"center\"/> </imageobject>"
@@ -777,7 +919,7 @@ msgstr ""
 "\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:14
+#: en/choosePackageGroups.xml:16
 #, fuzzy
 msgid ""
 "Packages are arranged into common groups, to make choosing what you need on "
@@ -789,25 +931,25 @@ msgstr ""
 "鼠标移至该组的名称上方。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:21
+#: en/choosePackageGroups.xml:23
 #, fuzzy
 msgid "<emphasis role=\"bold\">Workstation</emphasis>"
 msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:25
+#: en/choosePackageGroups.xml:27
 #, fuzzy
 msgid "<emphasis role=\"bold\">Server</emphasis>"
 msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:29
+#: en/choosePackageGroups.xml:31
 #, fuzzy
 msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
 msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:33
+#: en/choosePackageGroups.xml:35
 #, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can use "
@@ -815,7 +957,7 @@ msgid ""
 msgstr "单独选择软件包：您可以使用此选项来手动添加/移除软件包。"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:38
+#: en/choosePackageGroups.xml:40
 #, fuzzy
 msgid ""
 "See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
@@ -830,8 +972,10 @@ msgid "Choose Individual Packages"
 msgstr "选择单个软件包"
 
 #. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
+#. 2018/02/15 apb: Text and typography.
+#. 2018/02/25 apb: add xreflabel to this section.
 #. type: Content of: <section><mediaobject>
-#: en/choosePackagesTree.xml:9
+#: en/choosePackagesTree.xml:13
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
@@ -841,20 +985,21 @@ msgstr ""
 "\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:14
+#: en/choosePackagesTree.xml:18
 #, fuzzy
 msgid ""
 "Here you can add or remove any extra packages to customize your installation."
 msgstr "您可以在此处添加或移除额外的软件包，或自定义安装。"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:21
+#, fuzzy
 msgid ""
-"After having made your choice, you can click on the <guibutton>floppy icon</"
-"guibutton> at the bottom of the page to save your choice of packages (saving "
-"to a USB key works, too). You can then use this file to install the same "
-"packages on another system, by pressing the same button during install and "
-"choosing to load it."
+"After having made your choice, you can click on the <emphasis>floppy</"
+"emphasis> icon at the bottom of the page to save your choice of packages "
+"(saving to a USB key works, too). You can then use this file to install the "
+"same packages on another system, by pressing the same button during install "
+"and choosing to load it."
 msgstr ""
 "在确定选择后，您可以点击页面底部的 <guibutton>floppy icon</guibutton> 按钮来"
 "保存选择（同时也会将配置保存到  U 盘中）。你可以使用此文件在其他系统上进行相"
@@ -867,8 +1012,10 @@ msgstr "配置服务"
 
 #.  2012-12-25 marja - moved this section out of misc-params.xml 
 #.  2013-05-05 marja - added screenshot 
+#.  2018/02/16 apb: Minor text adjustment.
+#. 2018/02/25 apb: a) add xreflabel for this section. b) Added some bullets to the text.
 #. type: Content of: <section><mediaobject>
-#: en/configureServices.xml:11
+#: en/configureServices.xml:15
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
@@ -879,32 +1026,28 @@ msgstr ""
 "id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:16
+#: en/configureServices.xml:20
 #, fuzzy
 msgid ""
 "Here you can choose which services should start when you boot your system."
 msgstr "您可以在此处设置系统启动时需要启用的服务。"
 
-#. type: Content of: <section><para>
-#: en/configureServices.xml:19
-msgid "Click on a triangle to expand a group to all the relevant services."
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureServices.xml:25
+msgid ""
+"Click on a triangle to expand a group to all the relevant services. The "
+"settings DrakX chose are usually good."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/configureServices.xml:22
-#, fuzzy
-msgid "The settings DrakX chose are usually good."
-msgstr "DrakX自动选择的设置通常可正常工作。"
-
-#. type: Content of: <section><para>
-#: en/configureServices.xml:25
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureServices.xml:31
 msgid ""
 "If you highlight a service, some information about it is shown in the info "
 "box below."
 msgstr "若高亮选中服务，则可在下方的信息框中查看此服务的细节。"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:28
+#: en/configureServices.xml:37
 msgid "Only change things when you know very well what you are doing."
 msgstr "只有在您完全了解您的行为的风险后再作出改动。"
 
@@ -915,15 +1058,17 @@ msgstr "配置时区"
 
 #.  2012-12-25 marja - moved this part out of misc-params.xml 
 #.  2013-05-05 marja - added screenshot 
+#. 2018/02/13 apb: Minor text adjustment.
+#. 2018/02/25 apb: Added xreflabel to this section.
 #. type: Content of: <section><mediaobject>
-#: en/configureTimezoneUTC.xml:11
+#: en/configureTimezoneUTC.xml:15
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
-"configureTimezoneUTC.png\" revision=\"1\"/> </imageobject> <imageobject> "
-"<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
-"</imageobject>"
+"configureTimezoneUTC.png\" revision=\"1\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata format=\"png\" fileref=\"live-timeZone.png\" "
+"align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id="
 "\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
@@ -931,16 +1076,16 @@ msgstr ""
 "<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
 "format=\"PNG\"/> </imageobject>"
 
-#. type: Content of: <section><para>
-#: en/configureTimezoneUTC.xml:20
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureTimezoneUTC.xml:26
 #, fuzzy
 msgid ""
-"Choose your time-zone by choosing your country or a city close to you in the "
-"same time-zone."
+"Choose your timezone by choosing your country, or a city close to you in the "
+"same timezone."
 msgstr "选择国家/地区或城市来确定您的时区。"
 
 #. type: Content of: <section><para>
-#: en/configureTimezoneUTC.xml:24
+#: en/configureTimezoneUTC.xml:32
 #, fuzzy
 msgid ""
 "In the next screen you can choose to set your hardware clock to local time "
@@ -948,7 +1093,7 @@ msgid ""
 msgstr "在下一个窗口中，您可以将硬件时钟设置为本地时间或  GMT（也即 UTC）。"
 
 #. type: Content of: <section><note><para>
-#: en/configureTimezoneUTC.xml:29
+#: en/configureTimezoneUTC.xml:37
 msgid ""
 "If you have more than one operating system on your computer, make sure they "
 "are all set to local time, or all to UTC/GMT."
@@ -956,124 +1101,123 @@ msgstr ""
 "若您安装了多个操作系统，请确保硬件时钟均被设为本地时间，或均为 UTC/GMT。"
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:13
+#: en/configureX_card_list.xml:24
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "选择一个X服务器(配置您的显示卡)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:18
+#: en/configureX_card_list.xml:29
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_card_list-im1\" "
-"align=\"center\" fileref=\"dx2-configureX_card_list.png\" revision=\"1\"/> </"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
-"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:23
+#: en/configureX_card_list.xml:35
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
 msgstr "DrakX 有齐全的显卡数据库，一般情况下可以正确识别您的视频设备。"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:26
+#: en/configureX_card_list.xml:38
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
 msgstr "若安装程序无法正确检测您的显卡，请在以下列表中选择一个合适的配置："
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:29 en/configureX_monitor.xml:57
-msgid "vendor"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#, fuzzy
+msgid "Vendor"
 msgstr "制造商"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:33
-msgid "then the name of your card"
+#: en/configureX_card_list.xml:45
+#, fuzzy
+msgid "then the make of your card"
 msgstr "显卡名"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:37
-msgid "and the type of card"
+#: en/configureX_card_list.xml:49
+#, fuzzy
+msgid "and the model of card"
 msgstr "卡的类型"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:41
+#: en/configureX_card_list.xml:53
 #, fuzzy
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
-"<emphasis role=\"bold\">Xorg</emphasis> category, which provides more than "
-"40 generic and open source video card drivers. If you still can't find a "
-"specific driver for your card there is the option of using the <emphasis "
-"role=\"bold\">vesa</emphasis> driver which provides basic capabilities."
+"<emphasis>Xorg</emphasis> category, which provides more than 40 generic and "
+"open source video card drivers. If you still can't find a specific driver "
+"for your card there is the option of using the VESA driver which provides "
+"basic capabilities."
 msgstr ""
 "Xorg 目录提供了超过 40 种通用的开源显卡驱动。若您仍然无法找到合适的显卡驱动，"
 "请使用 vesa 驱动以确保基本的显示功能。"
 
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:47
+#. type: Content of: <section><caution><para>
+#: en/configureX_card_list.xml:61
 #, fuzzy
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
-"to the <emphasis role=\"bold\">Command-line</emphasis> Interface."
+"to the <emphasis>Command Line Interface</emphasis>"
 msgstr ""
 "请注意，若选择了不兼容的驱动，您可能无法使用图形化界面（但仍可使用命令行）。"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:51
+#: en/configureX_card_list.xml:65
 #, fuzzy
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
-"may only be available in the <emphasis role=\"bold\">Nonfree</emphasis> "
-"repository and in some cases only from the card manufacturers' websites."
+"may only be available in the <emphasis>Nonfree</emphasis> repository and in "
+"some cases only from the card manufacturers' websites. The "
+"<emphasis>Nonfree</emphasis> repository needs to be explicitly enabled to "
+"access them. If you didn't enable it previously, you should do this after "
+"your first reboot."
 msgstr ""
 "部分显卡制造商仅提供私有 Linux 驱动（在 Nonfree 仓库中），部分驱动仅能在制造"
 "商的官网上找到。"
 
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:56
-#, fuzzy
-msgid ""
-"The <emphasis role=\"bold\">Nonfree</emphasis> repository needs to be "
-"explicitly enabled to access them. If you didn't enable it previously, you "
-"should do this after your first reboot."
-msgstr ""
-"需要手动启用 Nonfree 仓库才能使用其中的程序。若您在此之前未选中 Nonfree 仓"
-"库，您应当在安装完成并重启后启用它。"
-
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:3
+#: en/configureX_chooser.xml:11
 msgid "Graphic Card and Monitor Configuration"
 msgstr "显示卡和显示器配置"
 
 #.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
+#. 2018/02/15 apb: Some text and typography.
+#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
+#. 2018/02/23 apb: Typo.
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:10
+#: en/configureX_chooser.xml:24
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
-"fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> </"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
-"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:15
+#: en/configureX_chooser.xml:30
 #, fuzzy
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
-"you chose for this install of <application>Mageia</application>, they are "
-"all based on a graphical user interface system called <acronym>X Window "
-"System</acronym>, or simply <acronym>X</acronym>. So in order for "
-"<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>, <acronym>LXDE</"
-"acronym> or any other graphical environment to work well, the following "
-"<acronym>X</acronym> settings need to be correct. Choose the correct "
-"settings if none are shown, or if you think the details are incorrect."
+"you chose for this install of Mageia, they are all based on a graphical user "
+"interface system called <literal>X Window System</literal>, or simply "
+"<quote>X</quote>. So in order for KDE Plasma, GNOME, LXDE or any other "
+"graphical environment to work well, the following <quote>X</quote> settings "
+"need to be correct. Choose the appropriate settings - if none are shown, or "
+"if you think the details are incorrect."
 msgstr ""
 "无论是哪一种图形环境（也叫桌面环境），都基于一个叫做 <acronym>X 窗口系统</"
 "acronym>（也叫 <acronym>X</acronym>）的服务。因此，必须正确设定以下的 "
@@ -1082,55 +1226,70 @@ msgstr ""
 "<application>DrakX</application> 没有提供默认选项，请手动指定正确参数。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:27
+#: en/configureX_chooser.xml:41
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:44
 msgid ""
-"<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
-"from the list if needed."
+"If you need to, you can select a specific card from this expandable list. "
+"See <xref linkend=\"configureX_card_list\"/>."
 msgstr ""
-"<emphasis><guibutton>显卡</guibutton></emphasis>：请从列表中选择您的显卡设"
-"备。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:33
+#: en/configureX_chooser.xml:49
+#, fuzzy
+msgid "<emphasis role=\"bold\">Monitor</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:52
 #, fuzzy
 msgid ""
-"<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
-"<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from "
-"the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose "
-"<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and "
-"vertical refresh rates of your monitor."
+"You can choose Plug'n Play, if applicable, or choose your monitor from the "
+"<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> list. Choose "
+"<emphasis>Custom</emphasis> if you prefer to manually set the horizontal and "
+"vertical refresh rates of your monitor. See <xref linkend="
+"\"configureX_monitor\"/>."
 msgstr ""
 "<emphasis><guibutton>显示器</guibutton></emphasis>：您可以选择 <guilabel>即插"
 "即用</guilabel> 显示器，或从 <guilabel>制造商</guilabel> 或 <guilabel>通用</"
 "guilabel> 列表中选择显示器。若需要手动指定显示器的横向/纵向刷新率，请点击 "
 "<guilabel>自定义</guilabel>。"
 
-#. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:41
-msgid "Incorrect refresh rates may damage your monitor"
-msgstr "不正确的刷新率可能会损坏显示器"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:60
+#, fuzzy
+msgid "<emphasis role=\"bold\">Resolution</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:63
 #, fuzzy
-msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
-"color depth of your monitor can be set here."
+msgid "The resolution and color depth of your monitor can be set here"
 msgstr ""
 "<emphasis><guibutton>分辨率</guibutton></emphasis>：选择显示器的分辨率和色彩"
 "深度。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:68
+#, fuzzy
+msgid "<emphasis role=\"bold\">Test</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:71
 #, fuzzy
 msgid ""
-"<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
-"always appear during install. If the option is there, and you test your "
-"settings, you should be ask whether your settings are correct. If you answer "
-"<emphasis role=\"bold\">yes</emphasis>, the settings will be kept. If you "
-"don't see anything, you'll return to the configuration screen and be able to "
-"reconfigure everything until the test result is satisfactory. If the test "
-"option is not available, then make sure your settings are on the safe side."
+"The test button does not always appear during install. If the option is "
+"there, and you test your settings, you should be asked whether your settings "
+"are correct. If you answer <emphasis>Yes</emphasis>, the settings will be "
+"kept. If you don't see anything, you'll return to the configuration screen "
+"and be able to reconfigure everything until the test result is satisfactory. "
+"If the test option is not available, then make sure your settings are on the "
+"safe side."
 msgstr ""
 "<emphasis><guibutton>测试</guibutton></emphasis>：测试按钮不一定总是出现在安"
 "装中。您可以按下此按钮来查看设置是否正确。若出现询问设置是否正确的对话框，您"
@@ -1139,28 +1298,42 @@ msgstr ""
 "emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:63
-msgid ""
-"<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
-"enable or disable various options."
+#: en/configureX_chooser.xml:81
+#, fuzzy
+msgid "<emphasis role=\"bold\">Options</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:84
+#, fuzzy
+msgid "Here you can choose to enable or disable various options"
 msgstr ""
 "<emphasis><guibutton>选项</guibutton></emphasis>：您可以在此处启用或禁用各类"
 "选项。"
 
+#. type: Content of: <section><warning><para>
+#: en/configureX_chooser.xml:89
+msgid ""
+"There is a risk of damaging a monitor if you choose refresh rates that are "
+"outside the frequency range of that monitor. This applies to older CRT "
+"displays: modern monitors will reject an unsupported frequency and normally "
+"enter standby mode."
+msgstr ""
+
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:11
+#: en/configureX_monitor.xml:22
 msgid "Choosing your Monitor"
 msgstr "选择您的显示器"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:14
+#: en/configureX_monitor.xml:25
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
 msgstr "DrakX 有齐全的显卡数据库，一般情况下可以正确识别您的视频设备。"
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:19
+#: en/configureX_monitor.xml:30
 #, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
@@ -1172,25 +1345,26 @@ msgstr ""
 "未知模式。</emphasis>若仍有疑问，请查询显示器文档。"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:26
-#, fuzzy
+#: en/configureX_monitor.xml:38
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
-"fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> </"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
-"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:31
-msgid "<emphasis>Custom</emphasis>"
-msgstr "<emphasis>自定义</emphasis>"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_monitor.xml:46
+msgid "Custom"
+msgstr "自定义"
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:33
+#. type: Content of: <section><variablelist><varlistentry><listitem><para>
+#: en/configureX_monitor.xml:49
+#, fuzzy
 msgid ""
-"This option allows you to set two critical parameters, the vertical refresh "
+"This option allows you to set two critical parameters: the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
 "screen is refreshed and horizontal sync is the rate at which scan lines are "
 "displayed."
@@ -1198,8 +1372,8 @@ msgstr ""
 "此选项允许您设置两个重要参数：垂直刷新率和水平同步率。垂直刷新率决定屏幕刷新"
 "的周期，水平同步率决定扫描行的显示速率。"
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:38
+#. type: Content of: <section><variablelist><varlistentry><listitem><para>
+#: en/configureX_monitor.xml:55
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1209,179 +1383,186 @@ msgstr ""
 "<emphasis>请不要</emphasis>选择与您的显示器不匹配的同步范围，这样做可能损害显"
 "示器。若仍有疑问，请查询显示器文档。"
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
-msgid "<emphasis>Plug 'n Play</emphasis>"
-msgstr "<emphasis>即插即用</emphasis>"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_monitor.xml:64
+msgid "Plug'n Play"
+msgstr ""
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:47
+#. type: Content of: <section><variablelist><varlistentry><listitem><para>
+#: en/configureX_monitor.xml:67
+#, fuzzy
 msgid ""
-"This is the default option and tries to determine the monitor type from the "
-"monitor database."
+"This is the default option and automatically tries to determine the monitor "
+"type from the monitor database."
 msgstr "默认选项，根据显示器数据库确定显示器类别。"
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:51
-msgid "<emphasis>Vendor</emphasis>"
-msgstr "<emphasis>供应商</emphasis>"
-
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:53
+#. type: Content of: <section><variablelist><varlistentry><listitem><para>
+#: en/configureX_monitor.xml:77
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
 "one you have, you can select it from the tree by selecting:"
 msgstr "若安装程序无法正确检测您的显示器，请在以下列表中选择一个合适的配置："
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:61
-msgid "the monitor manufacturers name"
-msgstr "显示器制造商名称"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_monitor.xml:86
+msgid "Manufacturer"
+msgstr ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:65
-msgid "the monitor description"
-msgstr "显示器描述"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_monitor.xml:90
+msgid "Monitor model"
+msgstr ""
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:69
-msgid "<emphasis>Generic</emphasis>"
-msgstr "<emphasis>通用</emphasis>"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_monitor.xml:96
+msgid "Generic"
+msgstr ""
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:71
+#. type: Content of: <section><variablelist><varlistentry><listitem><para>
+#: en/configureX_monitor.xml:99
 #, fuzzy
 msgid ""
-"selecting this group will list nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the <emphasis role="
-"\"bold\">Vesa</emphasis> card driver when your video hardware cannot be "
-"determined automatically. Once again it may be wise to be conservative in "
-"your selections."
+"Selecting this group will list nearly 30 display configurations such as "
+"1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is "
+"often a good monitor selection group if you need to use the VESA card driver "
+"when your video hardware cannot be determined automatically.  Once again it "
+"may be wise to be conservative in your selections."
 msgstr ""
 "此组可以支持近30种显示格式，如 1024x768 @ 60Hz 和笔记本上使用的平板显示器。当"
 "您因硬件无法被正确识别而必须使用 Vesa 显卡驱动器时，此选项将会提供最佳的兼容"
 "性。推荐保留此选项。"
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:7
-msgid "Custom disk partitioning with DiskDrake"
+#: en/diskdrake.xml:22
+#, fuzzy
+msgid "Custom Disk Partitioning with DiskDrake"
 msgstr "使用 DiskDrake 自定义磁盘分区方式"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:12
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
-msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
-
-#. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:27
 #, fuzzy
 msgid ""
-"If you wish to use encryption on your <emphasis role=\"bold\">/</emphasis> "
-"partition you must ensure that you have a separate <emphasis role=\"bold\">/"
-"boot</emphasis> partition. The encryption option for the <emphasis role="
-"\"bold\">/boot</emphasis> partition must NOT be set, otherwise your system "
-"will be unbootable."
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-diskdrake.png\"/> </imageobject>"
 msgstr ""
-"若您希望将 <literal>/</literal> 分区加密，您必须确保 /boot 位于单独的分区中，"
-"并且该分区不能被加密；否则，系统将无法启动。"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:29
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:38
 #, fuzzy
 msgid ""
-"Modify the layout of your disk(s)  here. You can remove or create "
-"partitions, change the filesystem of a partition or change its size and even "
-"view their details before you start."
+"Modify the layout of your disk(s) here. You can remove or create partitions, "
+"change the filesystem or size of a partition and even view their details "
+"before you start."
 msgstr ""
 "在此处调整磁盘布局。您可以移除或创建分区、改变文件系统类型或改变分区大小，同"
 "时预览操作后的效果。"
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:45
+#, fuzzy
 msgid ""
 "There is a tab at the top for every detected hard disk (or other storage "
-"device like a USB key). In the screen-shot above there are two available "
-"devices: <emphasis role=\"bold\">sda </emphasis>and <emphasis role=\"bold"
-"\">sdb</emphasis>."
+"device, like a USB key). In the screenshot above there are two available "
+"devices: <filename>sda </filename>and <filename>sdb</filename>."
 msgstr ""
+"每个硬盘及其他存储设备（如 U 盘）都在对应的标签页中显示。例如，在三个标签页中"
+"分别显示 sda、sdb、sdc 的磁盘布局。"
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:39
-#, fuzzy
-msgid ""
-"Take care with the <guibutton>Clear all</guibutton> option, use it only if "
-"you are sure you want to wipe all partitions on the selected storage device."
-msgstr "点击 <guibutton>全部清除</guibutton> 可以删除所选设备上的全部分区。"
-
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:43
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:52
 #, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
-"<guibutton>Expert mode</guibutton> provides more options such as a label "
-"(give a name to) a partition, or to choose a partition type."
+"<emphasis>Expert mode</emphasis> provides more options such as to label "
+"(name) a partition, or to choose a partition type."
 msgstr ""
 "对于其他操作：请先点击要操作的分区；然后查看其详细信息，或选择文件系统和挂载"
 "点，改变其大小或擦除它。"
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:49
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:60
 #, fuzzy
-msgid "Continue until you have adjusted everything to your satisfaction."
+msgid ""
+"Continue until you have adjusted everything to your satisfaction, then click "
+"<emphasis>Done</emphasis> when you're ready."
 msgstr "请继续，直到所需操作完成。"
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:52
-msgid "Click <guibutton>Done</guibutton> when you're ready."
-msgstr " 准备好时点击<guibutton>完成</guibutton>按钮。"
+#. type: Content of: <section><warning><orderedlist><listitem><para>
+#: en/diskdrake.xml:69
+#, fuzzy
+msgid ""
+"Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
+"are sure you want to wipe all partitions on the selected storage device."
+msgstr "点击 <guibutton>全部清除</guibutton> 可以删除所选设备上的全部分区。"
 
-#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:56
+#. type: Content of: <section><warning><orderedlist><listitem><para>
+#: en/diskdrake.xml:75
+#, fuzzy
+msgid ""
+"If you wish to use encryption on your <filename>/</filename> partition you "
+"must ensure that you have a separate <filename>/boot</filename> partition. "
+"The encryption option for the <filename>/boot</filename> partition must NOT "
+"be set, otherwise your system will be unbootable."
+msgstr ""
+"若您希望将 <literal>/</literal> 分区加密，您必须确保 /boot 位于单独的分区中，"
+"并且该分区不能被加密；否则，系统将无法启动。"
+
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/diskdrake.xml:87
 #, fuzzy
 msgid ""
 "If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
-"Partition) is present and correctly mounted on /boot/EFI (see below)"
+"Partition) is present and correctly mounted on <filename>/boot/EFI</"
+"filename>. See Figure 1 below."
 msgstr ""
 "若您需要在 UEFI 硬件上使用 Mageia，请确保您设置了 ESP（EFI 系统分区），并且已"
 "被挂载至 /boot/EFI（见下）"
 
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/diskdrake.xml:93
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
+"partition is present and of the correct type. See Figure 2 below."
+msgstr ""
+"若您使用传统的硬件+GPT硬盘分区，请确保您设置了 BIOS 引导分区，并且为其指定了"
+"正确的分区标志"
+
+#. type: Content of: <section><figure><title>
+#: en/diskdrake.xml:101
+#, fuzzy
+msgid "EFI System Partition"
+msgstr "使用现存的分区"
+
+#. type: Content of: <section><figure><mediaobject>
+#: en/diskdrake.xml:104
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:60
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:103 en/diskdrake.xml:117
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
-#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:72
-#, fuzzy
-msgid ""
-"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
-"partition is present and of the correct type"
+#. type: Content of: <section><figure><title>
+#: en/diskdrake.xml:115
+msgid "BIOS boot partition"
 msgstr ""
-"若您使用传统的硬件+GPT硬盘分区，请确保您设置了 BIOS 引导分区，并且为其指定了"
-"正确的分区标志"
 
-#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:76
+#. type: Content of: <section><mediaobject>
+#: en/diskdrake.xml:118 en/doPartitionDisks.xml:200
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -1395,49 +1576,57 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
-msgid "Partitioning"
+#: en/doPartitionDisks.xml:25
+#, fuzzy
+msgid "Suggested Partitioning"
 msgstr "分区"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:28
 #, fuzzy
 msgid ""
 "In this screen you can see the content of your hard drive(s) along with the "
-"DrakX partitioning proposals for where to install <application>Mageia</"
-"application>."
+"DrakX partitioning proposals for where to install Mageia."
 msgstr ""
 "在此处您可以查看硬盘驱动器中的内容，并选择 DrakX 分区向导所提供的 "
 "<application>Mageia</application> 的安装方法。"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:16
+#: en/doPartitionDisks.xml:32
 #, fuzzy
 msgid ""
-"The options available from those shown below will vary according to the "
-"layout and content of your particular hard drive(s)."
+"The actual options available from those shown below will vary according to "
+"the layout and content of your particular hard drive(s)."
 msgstr "根据特定硬盘布局和内容的不同，下列选项可能会有所不同。"
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:21
+#: en/doPartitionDisks.xml:37
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
-"\"center\"/> </imageobject>"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
-msgid "Use Existing Partitions"
-msgstr "使用现存的分区"
+#. type: Content of: <section><itemizedlist><title>
+#: en/doPartitionDisks.xml:47
+#, fuzzy
+msgid "Main Options"
+msgstr "选项"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:50
+#, fuzzy
+msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:53
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1445,303 +1634,308 @@ msgstr ""
 "若此选项可用，表面安装程序找到了现存的 Linux 分区，并且可以将其用于 Mageia 的"
 "安装。"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
-msgid "Use Free Space"
-msgstr "使用空闲空间"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:43
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:62
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
 msgstr "若硬盘上有未使用的区域，此选项将会把 Mageia 安装到该区域中。"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:49
-msgid "Use Free Space on a Windows Partition"
-msgstr "使用 Windows 分区中的空闲空间"
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:68
+#, fuzzy
 msgid ""
-"If you have unused space on an existing Windows partition, the installer may "
-"offer to use it."
-msgstr "若现存 Windows 分区中有空闲空间，安装程序将把 Mageia 安装在此处。"
+"<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:56
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:71
+#, fuzzy
 msgid ""
-"This can be a useful way of making room for your new Mageia installation, "
-"but is a risky operation so you should make sure you have backed up all "
-"important files!"
+"If you have unused space on an existing Windows partition, the installer may "
+"offer to use it. This can be a useful way of making room for your new Mageia "
+"installation, but is a risky operation so you should make sure you have "
+"backed up all important files!"
 msgstr ""
 "此选项可用于为 Mageia 腾出安装空间，但操作过程有一定风险。请您确保已经备份了"
 "所有重要文件！"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
-msgid ""
-"Note that this involves shrinking the size of the Windows partition. The "
-"partition must be \"clean\", meaning that Windows must have closed down "
-"correctly the last time it was used. It must also have been defragmented, "
-"although this is not a guarantee that all files in the partition have been "
-"moved out of the area that is about to be used. It is highly recommended to "
-"back up your personal files."
-msgstr ""
-"将会缩小 Windows 分区的大小。该分区必须为“clean”状态，即上一次使用 Windows 时"
-"必须正常地关机或重启。同时，该分区也应当进行碎片整理，即便不能将文件碎片完全"
-"移出待使用区域。我们推荐您对个人文件进行备份后再进行此操作。"
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:69
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:77
 #, fuzzy
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the proposed Mageia partition in dark blue with their "
 "intended sizes just underneath. You have the option to modify these sizes by "
-"clicking and dragging the gap between both partitions. See the following "
-"screen-shot."
+"clicking and dragging the gap between both partitions.  See the following "
+"screenshot:"
 msgstr ""
 "安装程序将用亮蓝色标记其余的 Windows 分区，用深蓝色标记将用于安装 Mageia 的分"
 "区位置。您可以点击和拖动目标分区之间的空隙以便更改分区大小（参见下面的截"
 "图）。"
 
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:76
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:85
 #, fuzzy
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
-msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
-"\"center\"/> </imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
-msgid "Erase and use Entire Disk."
-msgstr "擦除磁盘，并使用整个磁盘。"
+msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:88
 #, fuzzy
-msgid "This option will allocate the entire drive for Mageia."
+msgid "This option will allocate the entire drive for Mageia"
 msgstr "此选项将会把整个硬盘空间用于安装 Mageia。"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:93
-msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
-msgstr "注意！将会删除所选驱动器上的所有数据！请谨慎操作！"
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:96
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:92
+#, fuzzy
 msgid ""
-"If you intend to use part of the disk for something else, or you already "
-"have data on the drive that you are not prepared to lose, then do not use "
-"this option."
+"This will erase ALL data on the selected hard drive. Take care! If you "
+"intend to use part of the disk for something else, or you already have data "
+"on the drive that you are not prepared to lose, then do not use this option."
 msgstr ""
 "若您需要将磁盘的一部分用于存储其他数据，或者您不希望驱动器上的数据丢失，请不"
 "要使用此选项。"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:103
+#. type: Content of: <section><itemizedlist><listitem><important><para>
+#: en/doPartitionDisks.xml:99
+msgid ""
+"Note that this involves shrinking the size of the Windows partition. The "
+"partition must be \"clean\", meaning that Windows must have closed down "
+"correctly the last time it was used. It must also have been defragmented, "
+"although this is not a guarantee that all files in the partition have been "
+"moved out of the area that is about to be used. It is highly recommended to "
+"back up your personal files."
+msgstr ""
+"将会缩小 Windows 分区的大小。该分区必须为“clean”状态，即上一次使用 Windows 时"
+"必须正常地关机或重启。同时，该分区也应当进行碎片整理，即便不能将文件碎片完全"
+"移出待使用区域。我们推荐您对个人文件进行备份后再进行此操作。"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:110
 #, fuzzy
-msgid "Custom disk partitioning"
-msgstr "使用 DiskDrake 自定义磁盘分区方式"
+msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:113
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
 msgstr "允许您完全控制系统在硬盘上的安装方式。"
 
-#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:120
 #, fuzzy
-msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
-msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:129
 msgid ""
-"If you are not using the <emphasis role=\"bold\">Custom disk partitioning</"
-"emphasis> option, the installer will allocate the available space according "
-"to the following rules:"
+"If you are not using the <emphasis>Custom disk partitioning</emphasis> "
+"option, then the installer will allocate the available space according to "
+"the following rules:"
 msgstr ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:120
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:135
 #, fuzzy
 msgid ""
 "If the total available space is less than 50 GB, then only one partition is "
-"created. This will be the <emphasis role=\"bold\">/</emphasis> (root) "
-"partition."
+"created. This will be the <filename>/</filename> (root)  partition."
 msgstr "若可用空间小于 50GB，则只创建 / 分区，不创建单独的 /home 分区。"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:141
 #, fuzzy
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
 "are created"
 msgstr "若总可用空间大于 50GB，则创建三个分区。"
 
-#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:130
+#. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:146
 #, fuzzy
 msgid ""
-"6/19 of the total available place is allocated to <emphasis role=\"bold\">/</"
-"emphasis> with a maximum of 50 GB"
+"6/19 of the total available place is allocated to <filename>/</filename> "
+"with a maximum of 50 GB"
 msgstr "其中 6/19 被分配给 / 分区，最大不超过 50GB"
 
-#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:134
-msgid "1/19 is allocated to swap with a maximum of 4 GB"
+#. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:151
+#, fuzzy
+msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr "1/19 被分配给交换分区，最大不超过 4GB"
 
-#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:138
+#. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:156
 #, fuzzy
 msgid ""
-"the rest (at least 12/19) is allocated to <emphasis role=\"bold\">/home.</"
-"emphasis>"
+"the rest (at least 12/19) is allocated to <emphasis>/</"
+"emphasis><filename>home</filename><emphasis role=\"bold\">.</emphasis>"
 msgstr "剩余部分（至少 12/19）被分配给 /home 分区"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:144
-#, fuzzy
+#: en/doPartitionDisks.xml:164
 msgid ""
-"That means that from 160 GB or greater available space, the installer will "
-"create three partitions: 50 GB for <emphasis role=\"bold\">/</emphasis>, 4 "
-"GB for <emphasis role=\"bold\">swap</emphasis> and the remainder for "
-"<emphasis role=\"bold\">/home</emphasis>."
+"This means that from 160 GB or greater available space, the installer will "
+"create three partitions:"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:169
+msgid "50 GB for <filename>/</filename>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:173
+msgid "4 GB for <filename>swap</filename>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:177
+msgid "and the remainder for <filename>/home</filename>."
 msgstr ""
-"这意味着如果您有 160GB 可用空间，将会创建 50GB 的 / 分区，4GB 的交换分区，以"
-"及 106GB 的 /home 分区。"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:182
 #, fuzzy
 msgid ""
 "If you are using a UEFI system, the ESP (EFI System Partition) will be "
-"automatically detected - or created if it does not exist yet, and mounted "
-"on /boot/EFI. The <emphasis role=\"bold\">Custom disk partitioning</"
+"automatically detected - or created if it does not exist yet - and mounted "
+"on <filename>/boot/EFI</filename>. The <emphasis>Custom disk partitioning</"
 "emphasis> option is the only one that allows to check it has been correctly "
-"done"
+"done."
 msgstr ""
 "若您使用 UEFI 系统，将自动检测并创建 ESP（EFI 系统分区），之后将其挂载到 /"
 "boot/EFI。“自定义”选项仅用于检测该操作的结果是否正确"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:188
 #, fuzzy
 msgid ""
-"If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to "
-"create a BIOS boot partition if not already existing. It is a roughly 1 MiB "
-"partition with no mount point. Choose <xref linkend=\"diskdrake\"/> to be "
-"able to create it with the Installer like any other partition, just select "
-"BIOS boot partition as the filesystem type."
+"If you are using a Legacy (also known as BIOS) system with a GPT partitioned "
+"disk, you need to create a BIOS boot partition if it doesn't already exist. "
+"It should be about 1 MiB with no mount point. It can be created with the "
+"Installer, under <emphasis>Custom disk partitioning</emphasis>, like any "
+"other partition. Be sure to select <quote>BIOS boot partition</quote> for "
+"filesystem type."
 msgstr ""
 "若您使用传统的硬件（即 CSM  或 BIOS），并且使用 GPT 格式的硬盘分区，您需要先"
 "创建一个 BIOS 引导分区。该分区一般为 1 MiB 左右，且不会被挂载。请选择“自定义"
 "磁盘分区”，然后手动创建一个 BIOS 引导分区。"
 
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
-#, fuzzy
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
+#. type: Content of: <section><note><para>
+#: en/doPartitionDisks.xml:195
+msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
 
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:175
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:210
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
+"\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:182
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:216
 #, fuzzy
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512. Due to lack of available hardware, the "
 "partitioning tool used in the installer has not been tested with such a "
-"drive. Also some SSD devices now use an erase block size over 1 MB. If you "
-"have such a device we suggest that you partition the drive in advance, using "
-"an alternative partitioning tool like <emphasis role=\"bold\">gparted</"
-"emphasis>, and to use the following settings:"
+"drive."
 msgstr ""
 "一些新式驱动器的逻辑扇区大小为 4096 字节，而非传统的 512 字节。此类硬件尚未被"
 "测试。此外，一些 SSD 驱动器的擦除块大小为 1MB。若您正在使用这类驱动器，我们建"
 "议您使用其他的分区工具（如gparted）预先进行分区操作："
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:189
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:221
+#, fuzzy
+msgid ""
+"Some SSD devices now use an erase block size over 1 MB. If you have such a "
+"device we suggest that you partition the drive in advance, using an "
+"alternative partitioning tool like gparted, and to use the following "
+"settings:"
+msgstr ""
+"一些新式驱动器的逻辑扇区大小为 4096 字节，而非传统的 512 字节。此类硬件尚未被"
+"测试。此外，一些 SSD 驱动器的擦除块大小为 1MB。若您正在使用这类驱动器，我们建"
+"议您使用其他的分区工具（如gparted）预先进行分区操作："
+
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:228
 #, fuzzy
-msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:191
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:232
 #, fuzzy
-msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:236
 #, fuzzy
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
 msgstr "确保所有创建的分区的大小均为偶数倍 MB。"
 
 #. type: Content of: <article><info><title>
-#: en/DrakLive-cover.xml:4 en/DrakLive-cover.xml:30 en/DrakLive.xml:3
+#: en/DrakLive-cover.xml:15 en/DrakLive-cover.xml:54 en/DrakLive.xml:16
 msgid "Installation from LIVE medium"
 msgstr "从 LIVE 介质安装"
 
 #. type: Content of: <book><info>
-#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:4
+#: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:14
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakLive-cover.xml:10
-msgid "January 2015"
-msgstr "2015 年一月"
+#: en/DrakLive-cover.xml:23
+msgid "March 2016"
+msgstr ""
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakLive-cover.xml:11
+#: en/DrakLive-cover.xml:25
 msgid "Mageia 5"
 msgstr "Mageia 5"
 
 #. type: Content of: <book><info><cover><para>
-#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:14
+#: en/DrakLive-cover.xml:30 en/DrakX-cover.xml:27
 msgid "The Official Documentation for Mageia"
 msgstr "Mageia 的官方文档"
 
 #. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17
-msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+#: en/DrakLive-cover.xml:33 en/DrakX-cover.xml:30
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:20
-#: en/DrakX.xml:12
+#: en/DrakLive-cover.xml:38 en/DrakLive.xml:25 en/DrakX-cover.xml:35
+#: en/DrakX.xml:44
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
 "3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
@@ -1752,8 +1946,8 @@ msgstr ""
 "licenses/by-sa/3.0/</link>）发布。"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:23
-#: en/DrakX.xml:15
+#: en/DrakLive-cover.xml:42 en/DrakLive.xml:29 en/DrakX-cover.xml:39
+#: en/DrakX.xml:48
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1763,8 +1957,7 @@ msgstr ""
 "ns6:href=\"http://www.calenco.com\">Calenco CMS</link> 生成。"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:25
-#: en/DrakX.xml:17
+#: en/DrakLive-cover.xml:46 en/DrakX-cover.xml:43 en/DrakX.xml:52
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1773,15 +1966,15 @@ msgstr ""
 "内容由志愿者编写。若您希望完善此手册，请联系 <link ns6:href=\"https://wiki."
 "mageia.org/en/Documentation_team\">文档团队</link>。"
 
-#. type: Content of: <article><info><cover><para><note>
-#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:36
-#: en/DrakX.xml:6
+#. type: Content of: <section><itemizedlist><listitem><para><note>
+#: en/DrakLive-cover.xml:56 en/DrakLive.xml:19 en/DrakX-cover.xml:64
+#: en/DrakX.xml:38 en/selectKeyboard.xml:49
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:37
-#: en/DrakX.xml:7
+#: en/DrakLive-cover.xml:57 en/DrakLive.xml:20 en/DrakX-cover.xml:65
+#: en/DrakX.xml:39
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
 "screens you will see, depends on your hardware and the choices you make "
@@ -1790,43 +1983,48 @@ msgstr ""
 "其他人不一定能在此手册中看到你所看到的安装页面。这取决于你的硬件规格以及安装"
 "时的选项。"
 
-#. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:40
-#: en/DrakX.xml:10
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/DrakLive-cover.xml:60 en/DrakLive.xml:23 en/DrakX-cover.xml:68
+#: en/DrakX.xml:42 en/selectKeyboard.xml:56
 msgid "</note>"
 msgstr "</note>"
 
+#. type: Content of: <article><info><cover><para>
+#: en/DrakLive.xml:33
+#, fuzzy
+msgid ""
+"It was written by volunteers in their free time. Please contact the <link "
+"ns6:href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation "
+"Team</link>, if you would like to help improve this manual."
+msgstr ""
+"内容由志愿者编写。若您希望完善此手册，请联系 <link ns6:href=\"https://wiki."
+"mageia.org/en/Documentation_team\">文档团队</link>。"
+
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:3 en/DrakX-cover.xml:35 en/DrakX.xml:3
+#: en/DrakX-cover.xml:12 en/DrakX-cover.xml:61 en/DrakX.xml:35
 msgid "Installation with DrakX"
 msgstr "用 DrakX 安装"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:9
+#: en/DrakX-cover.xml:20
 msgid "February 2014"
 msgstr "2014 年二月"
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:10
+#: en/DrakX-cover.xml:22
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
-#. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakX-cover.xml:16
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
-
 #. type: Content of: <section><info><title>
 #: en/exitInstall.xml:3
 msgid "Congratulations"
 msgstr "恭喜"
 
 #.  Lebarhon 20170209 updated SC
+#. 2018/02/12 apb: Text and typography.
+#. 2018/02/25 apb: Added clickable link to mageia.org
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:9
+#: en/exitInstall.xml:13
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1835,49 +2033,50 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:18
+#, fuzzy
 msgid ""
-"You have finished installing and configuring <application>Mageia</"
-"application> and it is now safe to remove the installation medium and reboot "
-"your computer."
+"You have finished installing and configuring Mageia and it is now safe to "
+"remove the installation medium and reboot your computer."
 msgstr "您以完成安装和配置 Mageia，现在可以安全地移除安装介质并重新启动。"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:18
+#: en/exitInstall.xml:22
 #, fuzzy
 msgid ""
-"After reboot, in the bootloader screen, you can choose between the operating "
-"systems (if there are more than one) on your computer."
+"After rebooting, you can use the bootloader screen to choose which operating "
+"system to start (if there are more than one on your computer)."
 msgstr ""
 "重启之后，在引导界面可以看到操作系统选项（若您的计算机上有两个以上操作系"
 "统）。"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:22
+#: en/exitInstall.xml:26
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
 msgstr "若您没有调整引导器的配置，将会自动启动 Mageia。"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:30
 msgid "Enjoy!"
 msgstr "Enjoy!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:32
+#, fuzzy
 msgid ""
-"Visit www.mageia.org if you have any questions or want to contribute to "
-"Mageia"
+"Visit <link ns4:href=\"http://www.mageia.org/en/\">www.mageia.org/en/</link> "
+"if you have any questions or want to contribute to Mageia"
 msgstr "若您有任何疑问，或希望帮助完善 Mageia，请访问 www.mageia.org。"
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:3
+#: en/firewall.xml:7
 msgid "Firewall"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:6
+#: en/firewall.xml:10
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
 "determine which type of message from the Internet will be accepted by the "
@@ -1886,48 +2085,48 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:12
+#: en/firewall.xml:16
 msgid ""
 "In the default setting (no button is checked), no service of the system is "
-"accessible from the network. The <emphasis role=\"bold\">Everything (no "
-"firewall)</emphasis> enables access to all services of the machine - an "
-"option that does not make much sense in the context of the installer since "
-"it would create a totally unprotected system. Its veritable use is in the "
-"context of the Mageia Control Center (which uses the same GUI layout) for "
-"temporarily disabling the entire set of firewall rules for testing and "
-"debugging purposes."
+"accessible from the network. The <emphasis>Everything (no firewall)</"
+"emphasis> option enables access to all services of the machine - an option "
+"that does not make much sense in the context of the installer since it would "
+"create a totally unprotected system. Its veritable use is in the context of "
+"the Mageia Control Center (which uses the same GUI layout)  for temporarily "
+"disabling the entire set of firewall rules for testing and debugging "
+"purposes."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:21
+#: en/firewall.xml:25
 msgid ""
 "All other options are more or less self-explanatory. As an example, you will "
-"enable the <emphasis role=\"bold\">CUPS server</emphasis> if you want "
-"printers on your machine to be accessible from the network."
+"enable the CUPS server if you want printers on your machine to be accessible "
+"from the network."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:29
 #, fuzzy
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:27
+#: en/firewall.xml:31
 msgid ""
-"The <emphasis role=\"bold\">Advanced</emphasis> option opens a window where "
-"you can enable a series of services by typing a list of couples (blank "
+"The <emphasis>Advanced</emphasis> option opens a window where you can enable "
+"a series of services by typing a list of <quote>couples</quote> (blank "
 "separated)"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:35
 #, fuzzy
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr "<emphasis>通用</emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:34
+#: en/firewall.xml:38
 msgid ""
 "- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
 "the service you want to enable (e.g. 873 for the RSYNC service) as defined "
@@ -1935,28 +2134,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:42
 msgid ""
 "- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
 "<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:43
+#: en/firewall.xml:47
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:46
+#: en/firewall.xml:50
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:3
+#: en/formatPartitions.xml:10
 msgid "Formatting"
 msgstr "格式化"
 
@@ -1964,15 +2163,16 @@ msgstr "格式化"
 #.  NEEDS TO BE REVIEWED! 
 #.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
+#. 2018/02/10 apb: Text and typography.
 #. type: Content of: <section><mediaobject>
-#: en/formatPartitions.xml:15
+#: en/formatPartitions.xml:24
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-formatPartitions.png\" xml:id=\"formatPartitions-im1\" align=\"center"
-"\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata format=\"PNG\" xml:id=\"live-formatPartitions-im1\" align=\"center"
-"\" fileref=\"live-formatPartitions.png\" revision=\"1\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-formatPartitions.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"formatPartitions-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-formatPartitions.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"live-formatPartitions-im1\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
@@ -1982,7 +2182,7 @@ msgstr ""
 "</imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:24
+#: en/formatPartitions.xml:35
 #, fuzzy
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
@@ -1992,45 +2192,49 @@ msgstr ""
 "据将会被保留。"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:28
-msgid "Usually at least the partitions DrakX selected, need to be formatted"
+#: en/formatPartitions.xml:39
+#, fuzzy
+msgid ""
+"Usually, at least the partitions that DrakX selected need to be formatted."
 msgstr "一般情况下，DrakX 自动选择的分区需要被格式化。"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:31
+#: en/formatPartitions.xml:42
+#, fuzzy
 msgid ""
-"Click on <guibutton>Advanced</guibutton> to choose partitions you want to "
-"check for so called <emphasis>bad blocks</emphasis>"
+"Click on <emphasis>Advanced</emphasis> to choose the partitions you want to "
+"check for so-called <emphasis>bad blocks</emphasis>"
 msgstr ""
 "可以点击 <guibutton>高级</guibutton> 来选择您要检查<emphasis>坏块</emphasis>"
 "的分区。"
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:36
+#: en/formatPartitions.xml:47
 #, fuzzy
 msgid ""
 "If you're not sure you have made the right choice, you can click on "
-"<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton> "
-"and then on <guibutton>Custom</guibutton> to get back to the main screen, "
-"where you can choose to view details of your partitions."
+"<emphasis>Previous</emphasis>, again on <emphasis>Previous</emphasis> and "
+"then on <emphasis>Custom</emphasis> to get back to the main screen, where "
+"you can choose to view details of your partitions."
 msgstr ""
 "若您不确定所做选择是否正确，可以点击两次 <guibutton>上一页</guibutton>回到主"
 "界面，然后查看相应分区中的数据。"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:43
+#: en/formatPartitions.xml:54
+#, fuzzy
 msgid ""
-"When you are confident about the selection, click on <guibutton>Next</"
-"guibutton> to continue."
+"When you are confident about the selections, click on <emphasis>Next</"
+"emphasis> to continue."
 msgstr "若您确定选项正确，请点击<guibutton>下一页</guibutton>继续。"
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:10
+#: en/installer.xml:14
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX，Mageia 的安装器"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:13
+#: en/installer.xml:16
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2039,383 +2243,288 @@ msgstr ""
 "无论您是刚接触 GNU-Linux 的新人，还是老手，Mageia 安装器都能帮您轻松安装或升"
 "级系统。"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:17
-msgid ""
-"The initial menu screen has various options, however the default one will "
-"start the installer, which will normally be all that you will need."
-msgstr "初始页中有很多选项，安装器将会选择其中的默认项（一般是您所需的）。"
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:22
-msgid "Installation Welcome Screen"
-msgstr "安装欢迎屏幕"
+#: en/installer.xml:20
+msgid "The installation steps"
+msgstr "安装步骤"
 
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:25
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:23
 #, fuzzy
-msgid "Using a Mageia DVD"
-msgstr "使用 Mageia 提供的引导器"
+msgid ""
+"The install process is divided into a number of steps - the status of which "
+"is indicated in a panel to the left of the screen."
+msgstr "安装过程被分为多个步骤，可以在侧边栏看到安装进度。"
 
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:27
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:28
 #, fuzzy
 msgid ""
-"Here are the default welcome screens when using a Mageia DVD, The first one "
-"is what you will see if you have a UEFI system, the second one is for a "
-"Legacy system:"
+"Each step has one or more screens, which may also have <emphasis>Advanced</"
+"emphasis> sections with extra, less commonly required options."
 msgstr ""
-"此处是使用 Mageia DVD 安装的默认欢迎屏幕：第一个是使用传统引导的系统，第二个"
-"是使用 UEFI 引导的系统。"
+"每一步包含一个或多个窗口，并且可使用<guibutton>高级</guibutton>按钮查看不常用"
+"的选项。"
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:32
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:33
 #, fuzzy
-msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:37
 msgid ""
-"From this screen, you have access to options by pressing \"<emphasis role="
-"\"bold\">e</emphasis>\" to enter the edit mode. To come back to this screen, "
-"press either <emphasis role=\"bold\">Esc</emphasis> key to quit without "
-"saving or press the key <emphasis role=\"bold\">Ctrl</emphasis> or <emphasis "
-"role=\"bold\">F10</emphasis> to quit with saving."
+"Most screens have <emphasis>Help</emphasis> buttons for further details "
+"about the particular step."
 msgstr ""
+"多数窗口中有<guibutton>帮助</guibutton>按钮，可以提供当前操作的有关说明。"
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:45
+#. type: Content of: <section><section><caution><para>
+#: en/installer.xml:38
 #, fuzzy
-msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:50
 msgid ""
-"From this screen, it is possible to set some preferences (note that the "
-"options <emphasis role=\"bold\">F1</emphasis> to <emphasis role=\"bold\">F6</"
-"emphasis> are available only on Legacy systems):"
+"If at some point during the install you decide to abort the installation, it "
+"is possible to reboot, but please think twice before you do this. Once a "
+"partition has been formatted or updates have started to be installed, your "
+"computer is no longer in the same state and rebooting it could very well "
+"leave you with an unusable system."
 msgstr ""
+"若安装过程在某一步中断，您可以选择重启，但请三思而后行。一旦分区被格式化，或"
+"升级过程开始，电脑中的内容将发生变化，此时重启可能导致系统无法使用。若您确定"
+"要重启，可以按 <guibutton>Alt Ctrl F2</guibutton> 切换到终端，然后按下 "
+"<guibutton>Alt Ctrl Delete</guibutton> 来触发重启操作。"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:55
+#. type: Content of: <section><section><caution><para>
+#: en/installer.xml:43
 msgid ""
-"Within any of the <emphasis role=\"bold\">F2</emphasis> to <emphasis role="
-"\"bold\">F6</emphasis> options, you can view relevant help by pressing "
-"<emphasis role=\"bold\">F1</emphasis>"
+"If, in spite of this, you are very sure rebooting is what you want, go to a "
+"text terminal by pressing the keys <keycombo><keycap>Ctrl</"
+"keycap><keycap>Alt</keycap><keycap>F2</keycap></keycombo> together. After "
+"that, press <keycombo><keycap>Ctrl</keycap><keycap>Alt</"
+"keycap><keycap>Delete</keycap></keycombo> together to reboot."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:63
-msgid ""
-"Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
-"specific language for the installation."
-msgstr ""
+#. type: Content of: <section><section><title>
+#: en/installer.xml:48
+msgid "Installation Welcome Screen"
+msgstr "安装欢迎屏幕"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:67
-#, fuzzy
+#. type: Content of: <section><section><para>
+#: en/installer.xml:49
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+"The particular screen that you will first see when booting from the "
+"Installation media will depend on whether your computer motherboard is of "
+"the Legacy (BIOS) or UEFI type."
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
-"</imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:72
+#. type: Content of: <section><section><para>
+#: en/installer.xml:52
 #, fuzzy
 msgid ""
-"Use the arrow keys to select the language then press <emphasis role=\"bold"
-"\">Enter</emphasis>."
-msgstr "使用方向键来选择语言，然后按 Enter 键。"
+"The welcome menu screen has various options, however the default option will "
+"start the installer, and is normally all that you will need."
+msgstr "初始页中有很多选项，安装器将会选择其中的默认项（一般是您所需的）。"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:77
-#, fuzzy
-msgid ""
-"If needed, change the screen resolution by pressing <emphasis role=\"bold"
-"\">F3</emphasis> (Legacy mode only)."
-msgstr "按 F3 键可以更改屏幕分辨率（仅用于传统模式）。"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:56
+msgid "Legacy (BIOS) Systems"
+msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:81
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:58
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
+"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:88
-msgid ""
-"If you experience problems with the installation, you could try modifying "
-"the default settings using the <emphasis role=\"bold\">F6</emphasis> "
-"<emphasis role=\"bold\">Kernel Options</emphasis> (for UEFI systems press "
-"<emphasis role=\"bold\">e</emphasis> instead)."
+#. type: Content of: <section><section><section><itemizedlist><title>
+#: en/installer.xml:63
+msgid "Menu"
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:96
-#, fuzzy
-msgid "Default: It doesn't alter anything in the default options."
-msgstr "- 默认，即使用默认选项。"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:101
-#, fuzzy
-msgid ""
-"Safe Settings: Priority is given to the safer options at the price of a "
-"performance detriment."
-msgstr "- 安全设置，使用更安全的选项（同时会在一定程度上降低性能）"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:106
-#, fuzzy
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:66
 msgid ""
-"No ACPI: (Advanced Configuration and Power Interface): Power management "
-"features are not used."
-msgstr "- 无 ACPI（高级配置与电源接口），不使用电源管理功能"
+"Install Mageia to a hard disk. This is the default option, and will "
+"automatically start after a short while unless another option is selected."
+msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:113
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:69
 #, fuzzy
-msgid ""
-"No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU "
-"interrupt. Select this option if you experience system misbehaviour like a "
-"kernel panic in relation to APIC."
-msgstr ""
-"- 无本地 APIC（本地高级可编程终端控制器）。若您不需要控制 CPU 中断，可以选择"
-"此选项"
+msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:120
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:70
 msgid ""
-"When you select one of these entries, it modifies the default options "
-"displayed in the <guilabel>Boot Options</guilabel> line."
+"This option allows you to either re-install the bootloader for an existing "
+"Mageia installation or you can use it to restore a Windows bootloader."
 msgstr ""
-"若选择了这些选项之一，将会同时更改<guilabel>引导选项</guilabel>行中的默认选"
-"项。"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:125
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:75
 #, fuzzy
-msgid ""
-"In some Mageia releases, it may happen that the entries selected with "
-"<emphasis role=\"bold\">F6</emphasis> do not appear in the <guilabel>Boot "
-"Options</guilabel> line, despite this, they will in fact be applied."
-msgstr ""
-"在部分 Mageia 版本中，使用 F6 键选择的选项可能不会在<guilabel>引导选项</"
-"guilabel>中出现，但这并不影响选项发挥作用。"
+msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:132
-#, fuzzy
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:76
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+"Test the installed RAM by performing multiple read and write operations. "
+"Reboot to end the test."
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
-"imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:139
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:80
 #, fuzzy
-msgid ""
-"Pressing <emphasis role=\"bold\">F1</emphasis> opens a help window for "
-"various boot options. Select an item with the arrow keys and press <emphasis "
-"role=\"bold\">Enter</emphasis> for more details or press <emphasis role="
-"\"bold\">Esc</emphasis> to go back to the welcome screen."
-msgstr ""
-"按 F1 可以打开包含更多选项的新窗口。使用方向键和 Enter 来查看更多细节，或按 "
-"Esc 来返回到欢迎屏幕。"
+msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:146
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:81
+msgid "Press F2 for alternative languages."
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
-"</imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:151
-#, fuzzy
-msgid ""
-"The detailed view about the splash option. Press <emphasis role=\"bold"
-"\">Esc</emphasis> or select <guilabel>Return to Boot Options</guilabel> to "
-"go back to the options list. These options can be added by hand in the "
-"<guilabel>Boot Options</guilabel> line."
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:86
+msgid "UEFI Systems"
 msgstr ""
-"有关 splash 选项的细节。按 Esc 或选择 <guilabel>返回引导选项</guilabel>可以回"
-"到选项列表。可以手动将这些选项添加到<guilabel>引导选项</guilabel> 行。"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:158
-#, fuzzy
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:87
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+"From this screen, you can access options by pressing <keycap>e</keycap> to "
+"enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
+"to quit without saving or press <keycap>F10</keycap> to save and quit."
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
-"</imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:164
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:92
 #, fuzzy
 msgid ""
-"The help is translated in the chosen language with <emphasis role=\"bold"
-"\">F2</emphasis>."
-msgstr "按 F2 键可以将帮助翻译为所选语言。"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:168
-msgid ""
-"For more information about kernel options on legacy and UEFI systems, see: "
-"<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
-"\">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link>"
+"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
-"有关传统引导和 UEFI 引导的内核选项，请参考：<link ns2:href=\"https://wiki."
-"mageia.org/en/How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
-"How_to_set_up_kernel_options</link>。"
-
-#. type: Content of: <section><section><title>
-#: en/installer.xml:177
-msgid "The installation steps"
-msgstr "安装步骤"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:179
-#, fuzzy
-msgid ""
-"The install process is divided into a number of steps, the status of which "
-"is indicated in a panel to the left of the screen."
-msgstr "安装过程被分为多个步骤，可以在侧边栏看到安装进度。"
+"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:182
-#, fuzzy
-msgid ""
-"Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> sections with extra, less commonly required, options."
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:96
+msgid "In UEFI mode you have only two menu options to choose from:"
 msgstr ""
-"每一步包含一个或多个窗口，并且可使用<guibutton>高级</guibutton>按钮查看不常用"
-"的选项。"
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:186
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:99
 #, fuzzy
+msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:103
 msgid ""
-"Most screens have <guibutton>Help</guibutton> buttons for further details "
-"about the particular step."
+"<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
+"re-install the bootloader for an existing Mageia installation or you can use "
+"it to restore a Windows bootloader."
 msgstr ""
-"多数窗口中有<guibutton>帮助</guibutton>按钮，可以提供当前操作的有关说明。"
 
-#. type: Content of: <section><section><note><para>
-#: en/installer.xml:190
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:109
 #, fuzzy
 msgid ""
-"If at some points during the install you decide to stop the installation, it "
-"is possible to reboot, but please think twice before you do this. Once a "
-"partition has been formatted or updates have started to be installed, your "
-"computer is no longer in the same state and rebooting it could very well "
-"leave you with an unusable system. If in spite of this you are very sure "
-"rebooting is what you want, go to a text terminal by pressing the three keys "
-"<guibutton>Alt Ctrl F2</guibutton> at the same time. After that, press "
-"<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot."
-msgstr ""
-"若安装过程在某一步中断，您可以选择重启，但请三思而后行。一旦分区被格式化，或"
-"升级过程开始，电脑中的内容将发生变化，此时重启可能导致系统无法使用。若您确定"
-"要重启，可以按 <guibutton>Alt Ctrl F2</guibutton> 切换到终端，然后按下 "
-"<guibutton>Alt Ctrl Delete</guibutton> 来触发重启操作。"
+"If you booted from a USB stick, you will see the above options duplicated, "
+"and in this case, you should use the set that will be suffixed with \"USB\"."
+msgstr "若从 U 盘引导，除了以”uSB“结尾的行以外，还会有额外的两行供选择。"
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:203
+#: en/installer.xml:115
 msgid "Installation Problems and Possible Solutions"
 msgstr "安装问题和问题解决方案"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:206
+#: en/installer.xml:117
 msgid "No Graphical Interface"
 msgstr "不使用图形界面"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:210
+#: en/installer.xml:120
+#, fuzzy
 msgid ""
-"After the initial screen you did not reach the language selection screen. "
-"This can happen with some graphic cards and older systems. Try using low "
-"resolution by typing <code>vgalo</code> at the prompt."
+"After the initial screen you did not progress to the <emphasis>Language "
+"Selection</emphasis> screen. This can happen with some graphic cards and "
+"older systems. Try using low resolution by typing <command>vgalo</command> "
+"at the prompt."
 msgstr ""
 "在初始屏幕之后，可能无法显示语言选择窗口。这中情况可能发生在部分显卡和较老的"
 "系统中。请尝试在提示后输入 <code>vgalo</code> 来切换到较低分辨率。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:217
+#: en/installer.xml:126
 #, fuzzy
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
-"In this case it is worth trying a text mode installation. To use this press "
-"<emphasis role=\"bold\">Esc</emphasis> at the first welcome screen and "
-"confirm with <emphasis role=\"bold\">ENTER</emphasis>. You will be presented "
-"with a black screen with the word \"boot:\". Type \"text\" and press "
-"<emphasis role=\"bold\">ENTER</emphasis> to continue with the installation "
-"in text mode."
+"In this case it is worth trying a text-mode installation. To use this press "
+"<keycap>Esc</keycap> at the <emphasis>Welcome</emphasis> screen and confirm "
+"with <keycap>ENTER</keycap>. You will be presented with a black screen with "
+"a <prompt>boot:</prompt> prompt. Type <command>text</command> and press "
+"<keycap>ENTER</keycap> to continue with the installation in text mode."
 msgstr ""
 "若硬件较老，可能无法使用图形化安装程序。这种情况下，可以尝试文本安装模式：在"
 "首个欢迎界面中按 Esc，然后按 Enter。在出现的黑色屏幕中，输入“text”，然后按 "
 "Enter，即可进入文本安装模式。"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:230
+#: en/installer.xml:138
 msgid "The Install Freezes"
 msgstr "安装停止"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:232
+#: en/installer.xml:139
+#, fuzzy
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
-"problem with hardware detection. In this case the automatic detection of "
-"hardware may be bypassed and dealt with later. To try this, type "
-"<code>noauto</code> at the prompt. This option may also be combined with "
-"other options as necessary."
+"problem with hardware detection. In this case the automatic hardware "
+"detection may be bypassed and dealt with later. To try this, type "
+"<command>noauto</command> at the prompt. This option may also be combined "
+"with other parameters as necessary."
 msgstr ""
 "若系统在安装过程中停止响应（卡死），可能是硬件检测过程出现问题。在这种情况"
 "下，可以先跳过硬件检测过程：在命令提示后输入 <code>noauto</code>。此选项也可"
 "以与其他选项联合使用。"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:240
+#: en/installer.xml:146
 msgid "RAM problem"
 msgstr "内存问题"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:242
+#: en/installer.xml:147
 #, fuzzy
 msgid ""
 "This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
-"<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. e."
-"g. <code>mem=256M</code> would specify 256MB of RAM."
+"<literal>mem=<replaceable>xxx</replaceable>M</literal> parameter, where "
+"<replaceable>xxx</replaceable> is the correct amount of RAM. e.g. "
+"<literal>mem=256M</literal> would specify 256MB of RAM."
 msgstr ""
 "部分情况下，硬件可能无法正确地检测可用 RAM 大小。要手动指定它，可以使用 "
 "<code>mem=xxxM</code> 参数，其中 xxx 是 RAM 的总大小。例如，<code>mem=256M</"
 "code> 表示 RAM 的大小为 256MB。"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:249
+#: en/installer.xml:154
 msgid "Dynamic partitions"
 msgstr "动态分区"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:251
+#: en/installer.xml:155
 #, fuzzy
 msgid ""
-"If you converted your hard disk from <emphasis role=\"bold\">basic</"
-"emphasis> format to <emphasis role=\"bold\">dynamic</emphasis> format in "
-"Microsoft Windows, then it is not possible to install Mageia on this disc. "
-"To revert to a basic disk, see the Microsoft documentation: <link ns2:href="
-"\"http://msdn.microsoft.com/en-us/library/cc776315.aspx\">http://msdn."
-"microsoft.com/en-us/library/cc776315.aspx</link>."
+"If you converted your hard disk from <literal>Basic</literal> format to "
+"<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
+"possible to install Mageia on this disc. To revert to a <literal>Basic</"
+"literal> disk, see the Microsoft documentation: <link ns2:href=\"http://msdn."
+"microsoft.com/en-us/library/cc776315.aspx\">http://msdn.microsoft.com/en-us/"
+"library/cc776315.aspx</link>."
 msgstr ""
 "若您在微软 Windows 中将硬盘从“basic”格式转变为“dynamic”格式，该硬盘将无法用"
 "于 Mageia 安装。要将硬盘转变回“basic”格式，请参见微软的文档：<link ns2:href="
@@ -2423,19 +2532,15 @@ msgstr ""
 "microsoft.com/en-us/library/cc776315.aspx</link>。"
 
 #. type: Content of: <section><info><title>
-#: en/installUpdates.xml:3
+#: en/installUpdates.xml:16
 msgid "Updates"
 msgstr "更新"
 
-#.  Made by marja on 2012 03 30 
-#.  NEEDS TO BE REVIEWED! 
-#.  marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename
-#.  marja, 2012-04-24 added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/installUpdates.xml:15
+#: en/installUpdates.xml:20
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-installUpdates.png\" "
+"<imageobject> <imagedata format=\"png\" fileref=\"dx2-installUpdates.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </"
 "imageobject>"
 msgstr ""
@@ -2443,96 +2548,110 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:20
+#: en/installUpdates.xml:25
+#, fuzzy
 msgid ""
-"Since this version of <application>Mageia</application> was released, some "
-"packages will have been updated or improved."
+"Since this version of Mageia was released, some packages will have been "
+"updated or improved."
 msgstr ""
 "在此版本的 <application>Mageia</application> 发布之后，一些软件包将会被更新或"
 "改善。"
 
-#. type: Content of: <section><para>
-#: en/installUpdates.xml:24
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installUpdates.xml:30
+msgid ""
+"Select <emphasis>Yes</emphasis> if you wish to download and install them"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installUpdates.xml:35
 #, fuzzy
 msgid ""
-"Choose <guilabel>Yes</guilabel> if you wish to download and install them, "
-"select <guilabel>No</guilabel> if you don't want to do this now, or if you "
+"Select <emphasis>No</emphasis> if you don't want to do this now, or if you "
 "aren't connected to the Internet"
 msgstr ""
 "若您希望下载和安装更新后的软件包，请选择 <guilabel>是</guilabel>；若您不希望"
 "这样做，或无法连接到互联网，请选择 <guilabel>否</guilabel>。"
 
-#. type: Content of: <section><para>
-#: en/installUpdates.xml:29
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installUpdates.xml:40
 #, fuzzy
-msgid "Press <guibutton>Next</guibutton> to continue"
+msgid "Press <emphasis>Next</emphasis> to continue"
 msgstr "然后按<guibutton>下一步</guibutton>继续"
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:1
-msgid "Login screen"
+#: en/login.xml:4
+#, fuzzy
+msgid "Login Screen"
 msgstr "登录界面"
 
 #. type: Content of: <section><mediaobject>
-#: en/login.xml:1
+#: en/login.xml:7
+#, fuzzy
 msgid ""
-"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
-"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
 "login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
-#: en/login.xml:1
-msgid "KDM login screen"
+#: en/login.xml:11
+#, fuzzy
+msgid "SDDM login screen"
 msgstr "KDM 登录界面"
 
 #. type: Content of: <section><para>
-#: en/login.xml:1
-msgid "Finally, you will come to the login screen."
+#: en/login.xml:14
+#, fuzzy
+msgid "Finally, you will come to the desktop login screen."
 msgstr "最后，您将会看到登录界面。"
 
 #. type: Content of: <section><para>
-#: en/login.xml:1
+#: en/login.xml:15
+#, fuzzy
 msgid ""
 "Enter your user name and user password, and in a few seconds you will find "
-"yourself with a loaded KDE or GNOME desktop, depending on which live medium "
-"you used. You can now start using your Mageia installation."
+"yourself with a loaded KDE Plasma or GNOME desktop, depending on which live "
+"medium you used. You can now start using and enjoying your Mageia "
+"installation."
 msgstr ""
 "请输入您的用户名和密码，随后您将看到 KDE 或 GNOME 桌面（根据您所选的安装介质"
 "而异）。您现在即可使用 Mageia 系统。"
 
 #. type: Content of: <section><para>
-#: en/login.xml:3
+#: en/login.xml:16
+#, fuzzy
 msgid ""
-"You can find another part of our documentation in <link linkend=\"https://"
-"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
+"You can find further documentation in <link xmlns:ns0=\"http://www.w3."
+"org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
 msgstr ""
 "可以在 <link linkend=\"https://wiki.mageia.org/en/Category:Documentation"
 "\">Mageia wiki</link> 中找到有关系统使用的方法。"
 
 #. type: Content of: <section><info><title>
-#: en/media_selection.xml:3
-msgid "Media Selection (Nonfree)"
-msgstr "介质选择 (Nonfree)"
+#: en/media_selection.xml:10
+msgid "Nonfree Media"
+msgstr ""
 
 #.  papoteur 2013-04-11  - created 
 #.  marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)
 #.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
 #. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
+#. 2019.01.05 apb: Changed Ati to AMD in Nonfree para.
 #. type: Content of: <section><mediaobject>
-#: en/media_selection.xml:15
-#, fuzzy
+#: en/media_selection.xml:24
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" align="
-"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
-"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
-#: en/media_selection.xml:20
+#: en/media_selection.xml:30
 msgid ""
 "Here you have the list of available repositories. Not all repositories are "
 "available, according to which media you use for installing. The repositories "
@@ -2543,19 +2662,20 @@ msgstr ""
 "决定下一步中可用的软件包。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:27
+#: en/media_selection.xml:37
 msgid ""
 "The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
 "the base of the distribution."
 msgstr "<emphasis>Core</emphasis> 仓库无法被禁用，因其包含发行版中的基础软件。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:32
+#: en/media_selection.xml:42
+#, fuzzy
 msgid ""
 "The <emphasis>Nonfree</emphasis> repository includes packages that are free-"
 "of-charge, i.e. Mageia may redistribute them, but they contain closed-source "
 "software (hence the name - Nonfree). For example this repository includes "
-"nVidia and ATI graphics card proprietary drivers, firmware for various WiFi "
+"nVidia and AMD graphics card proprietary drivers, firmware for various WiFi "
 "cards, etc."
 msgstr ""
 "<emphasis>Nonfree</emphasis> 仓库包含了免费（因此Mageia可以再分发）、但不开源"
@@ -2563,7 +2683,7 @@ msgstr ""
 "等。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:40
+#: en/media_selection.xml:50
 #, fuzzy
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
@@ -2582,63 +2702,65 @@ msgid "Minimal Install"
 msgstr "最小安装"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:11
+#: en/minimal-install.xml:17
 #, fuzzy
 msgid ""
-"You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
+"Minimal Installation is intended for those with specific uses in mind for "
+"Mageia, such as a server or a specialised workstation. You will probably use "
+"this option combined with the <emphasis>Individual package selection</"
+"emphasis> option to fine-tune your installation. See <xref linkend="
+"\"choosePackagesTree\"/>."
 msgstr ""
-"在软件包组选择窗口中，您可以通过取消选择所有项来实现最小化安装，参见 <xref "
-"linkend=\"choosePackageGroups\"></xref>。"
+"最小化安装通常被用于在服务器或特定工作站上安装 Mageia。您可能会将此选项与“独"
+"立软件包选择”选项配合使用，以便微调您的安装配置，参见 <xref linkend="
+"\"choosePackagesTree\"></xref>。"
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:14
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:24
 #, fuzzy
 msgid ""
-"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
-"package selection</emphasis> option in the same screen."
-msgstr "若需要，您可以在该窗口中勾选“独立选择软件包”选项。"
+"You can choose a <emphasis>Minimal Installation</emphasis> by de-selecting "
+"everything in the <emphasis>Package Group Selection</emphasis> screen, see "
+"<xref linkend=\"choosePackageGroups\"/>."
+msgstr ""
+"在软件包组选择窗口中，您可以通过取消选择所有项来实现最小化安装，参见 <xref "
+"linkend=\"choosePackageGroups\"></xref>。"
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:17
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:28
 #, fuzzy
 msgid ""
-"Minimal Installation is intended for those with specific uses in mind for "
-"<application>Mageia</application>, such as a server or a specialised "
-"workstation. You will probably use this option combined with the <emphasis "
-"role=\"bold\">Individual package selection</emphasis> option mentioned "
-"above, to fine-tune your installation, see <xref linkend=\"choosePackagesTree"
-"\"/>."
-msgstr ""
-"最小化安装通常被用于在服务器或特定工作站上安装 Mageia。您可能会将此选项与“独"
-"立软件包选择”选项配合使用，以便微调您的安装配置，参见 <xref linkend="
-"\"choosePackagesTree\"></xref>。"
+"If desired, you can additionally tick the <emphasis>Individual package "
+"selection</emphasis> option in the same screen."
+msgstr "若需要，您可以在该窗口中勾选“独立选择软件包”选项。"
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:33
 #, fuzzy
 msgid ""
-"If you choose this installation method, then the relevant screen will offer "
-"you a few useful extras to install, such as documentation and X."
+"If you choose this installation method, then the relevant screen (see "
+"screenshot below) will offer you a few useful extras to install, such as "
+"documentation and <quote>X</quote>."
 msgstr ""
 "若您选择了安装类别，相应的窗口将会为您展示一些额外的有用软件，例如 X 服务的文"
 "档。"
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:26
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:37
 msgid ""
-"If <emphasis role=\"bold\">With X</emphasis> is chosen, then IceWM (a "
+"If the <emphasis>With X</emphasis> option is selected, then IceWM (a "
 "lightweight desktop environment) will also be included."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:29
+#: en/minimal-install.xml:42
+#, fuzzy
 msgid ""
-"The basic documentation is provided in the form of man and info pages.  It "
-"contains the man pages from the <link xlink:href=\"http://www.tldp.org/"
-"manpages/man.html\">Linux Documentation Project</link> and the <link xlink:"
-"href=\"http://www.gnu.org/software/coreutils/manual/\">GNU coreutils</link> "
-"info pages."
+"The basic documentation is provided in the form of <quote>man</quote> and "
+"<quote>info</quote> pages. It contains the man pages from the <link xlink:"
+"href=\"http://www.tldp.org/manpages/man.html\">Linux Documentation Project</"
+"link> and the <link xlink:href=\"http://www.gnu.org/software/coreutils/"
+"manual/\">GNU coreutils</link> info pages."
 msgstr ""
 "一些基础的文档由 man 和 info 命令提供。其中包含了来自 <link xlink:href="
 "\"http://www.tldp.org/manpages/man.html\">Linux Documentation Project</link> "
@@ -2646,7 +2768,7 @@ msgstr ""
 "manual/\">GNU coreutils</link> 的 info 帮助页。"
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:35
+#: en/minimal-install.xml:48
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
@@ -2658,31 +2780,39 @@ msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
-msgid "Summary of miscellaneous parameters"
-msgstr "一些杂项"
+#, fuzzy
+msgid "Configuration Summary"
+msgstr "声音配置"
 
 #.  Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC
+#. 2018/02/09 apb: Changed title to Configuration Summary (as agreed). Also, text and typography.
+#. 2018/02/22 apb: Changed list styles.
+#. 2018/02/23 apb: Updated dx2-summaryBottom.png
+#. 2018/02/24 apb: Changed list style
+#. 2018/02/24 apb: Centre-align dx2-summaryTop.png
 #. type: Content of: <section><mediaobject>
-#: en/misc-params.xml:10
+#: en/misc-params.xml:19
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/misc-params.xml:15
+#: en/misc-params.xml:24
 #, fuzzy
 msgid ""
 "DrakX presents a proposal for the configuration of your system depending on "
 "the choices you made and on the hardware detected. You can check the "
-"settings here and change them if you want by pressing <guibutton>Configure</"
-"guibutton>."
+"settings here and change them if you want by pressing <emphasis>Configure</"
+"emphasis>."
 msgstr ""
 "DrakX 会根据您的选择以及检测到的硬件自动生成合适的配置。您可以在此处检查或更"
 "改它们（点击 <guibutton>配置</guibutton> 按钮）。"
 
 #. type: Content of: <section><note><para>
-#: en/misc-params.xml:21
+#: en/misc-params.xml:30
 #, fuzzy
 msgid ""
 "As a general rule, it is recommended that you accept the default settings "
@@ -2690,49 +2820,50 @@ msgid ""
 msgstr "一般而言，您可以直接使用推荐配置，除非您遇到以下三种情况："
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
-#: en/misc-params.xml:24
+#: en/misc-params.xml:33
 msgid "there are known issues with a default setting"
 msgstr "您预知该默认配置存在问题"
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
-#: en/misc-params.xml:28
+#: en/misc-params.xml:37
 msgid "the default setting has already been tried and it fails"
 msgstr "您尝试了默认配置，但安装失败"
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
-#: en/misc-params.xml:32
+#: en/misc-params.xml:41
 #, fuzzy
-msgid ""
-"some other factor mentionned in the detailed sections below is an issue."
+msgid "some other factor mentioned in the detailed sections below is an issue"
 msgstr "后续章节中所提到的其他情况"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:40
+#: en/misc-params.xml:49
 msgid "System parameters"
 msgstr "系统参数"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:45
-msgid "<guilabel>Timezone</guilabel>"
-msgstr "<guilabel>时区</guilabel>"
+#: en/misc-params.xml:54
+#, fuzzy
+msgid "<emphasis role=\"bold\">Timezone</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:47
+#: en/misc-params.xml:56
 #, fuzzy
 msgid ""
-"DrakX selects a time zone for you, depending on your preferred language. You "
+"DrakX selects a timezone for you, depending on your preferred language. You "
 "can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/>"
 msgstr ""
 "DrakX 根据您的语言设置自动选择了时区。您也可以手动改变时区。参见 <xref "
 "linkend=\"configureTimezoneUTC\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:53
-msgid "<guilabel>Country / Region</guilabel>"
-msgstr "<guilabel>国家/地区</guilabel>"
+#: en/misc-params.xml:62
+#, fuzzy
+msgid "<emphasis role=\"bold\">Country / Region</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:56
+#: en/misc-params.xml:64
 #, fuzzy
 msgid ""
 "If the selected country is wrong, it is very important that you correct the "
@@ -2742,47 +2873,49 @@ msgstr ""
 "\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:62
-msgid "<guilabel>Bootloader</guilabel>"
-msgstr "<guilabel>引导器</guilabel>"
+#: en/misc-params.xml:70
+#, fuzzy
+msgid "<emphasis role=\"bold\">Bootloader</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:64
-msgid "DrakX has made good choices for the bootloader setting."
+#: en/misc-params.xml:72
+#, fuzzy
+msgid "DrakX proposal for the bootloader setting"
 msgstr "DrakX 为引导器进行了自动设置。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:67
+#: en/misc-params.xml:75
 #, fuzzy
-msgid "Do not change anything, unless you know how to configure GRUB2"
+msgid ""
+"Do not change anything, unless you know how to configure GRUB2. For more "
+"information, see <xref linkend=\"setupBootloader\"/>"
 msgstr "除非您懂得如何配置 GRUB 2，否则请勿更改这些配置"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:70
-msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
-msgstr "更多信息，参见 <xref linkend=\"setupBootloader\"/>"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:75
-msgid "<guilabel>User management</guilabel>"
-msgstr "<guilabel>用户管理</guilabel>"
+#: en/misc-params.xml:83
+#, fuzzy
+msgid "<emphasis role=\"bold\">User management</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:78
+#: en/misc-params.xml:85
+#, fuzzy
 msgid ""
-"You can add extra users here. They will each get their own <literal>/home</"
-"literal> directories."
+"You can add extra users here. They will each be allocated their own "
+"<filename>/home</filename> directories."
 msgstr ""
 "您可以在此处添加额外的用户。将会为每个用户在 <literal>/home</literal> 下创建"
 "目录。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:84
-msgid "<guilabel>Services</guilabel>:"
-msgstr "<guilabel>服务</guilabel>:"
+#: en/misc-params.xml:91
+#, fuzzy
+msgid "<emphasis role=\"bold\">Services</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:86
+#: en/misc-params.xml:93
 #, fuzzy
 msgid ""
 "System services refer to those small programs which run in the background "
@@ -2791,29 +2924,27 @@ msgstr ""
 "系统服务指在后台运行的小程序（守护进程）。此工具允许您启用或禁用特定任务。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:90
+#: en/misc-params.xml:97
+#, fuzzy
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
-"prevent your computer from operating correctly."
+"prevent your computer from operating correctly. For more information, see "
+"<xref linkend=\"configureServices\"/>"
 msgstr "在做出更改之前，请认真审视选项 - 任何错误都可能导致系统无法正常运行。"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:94
-msgid "For more information, see <xref linkend=\"configureServices\"/>"
-msgstr "更多信息，参见 <xref linkend=\"configureServices\"/>."
-
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:101
+#: en/misc-params.xml:106
 msgid "Hardware parameters"
 msgstr "硬件参数"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:106
-msgid "<guilabel>Keyboard</guilabel>:"
-msgstr "<guilabel>键盘</guilabel>:"
+#: en/misc-params.xml:111
+#, fuzzy
+msgid "<emphasis role=\"bold\">Keyboard</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:108
+#: en/misc-params.xml:113
 #, fuzzy
 msgid ""
 "Configure your keyboard layout according to your location, language and type "
@@ -2821,7 +2952,7 @@ msgid ""
 msgstr "在这里，您可以根据您所在的位置、使用的语言和键盘类型来设置键盘布局。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><note><para>
-#: en/misc-params.xml:113
+#: en/misc-params.xml:118
 msgid ""
 "If you notice a wrong keyboard layout and want to change it, keep in mind "
 "that your passwords are going to change too."
@@ -2830,50 +2961,54 @@ msgstr ""
 "发生改变。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:119
-msgid "<guilabel>Mouse</guilabel>:"
-msgstr "<guilabel>鼠标</guilabel>:"
+#: en/misc-params.xml:124
+#, fuzzy
+msgid "<emphasis role=\"bold\">Mouse</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:121
+#: en/misc-params.xml:126
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
 msgstr "您可以添加或配置其他触控设备、平板、轨迹球等。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
-msgid "<guilabel>Sound card</guilabel>:"
-msgstr "<guilabel>声卡</guilabel>:"
+#: en/misc-params.xml:131
+#, fuzzy
+msgid "<emphasis role=\"bold\">Sound card</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
-#, fuzzy
+#: en/misc-params.xml:133
+msgid "The installer will use the default driver if one is available."
+msgstr ""
+
+#. type: Content of: <section><section><para>
+#: en/misc-params.xml:136 en/soundConfig.xml:46
 msgid ""
-"The installer uses the default driver - if there is a default one. The "
-"option to select a different driver is only given when there is more than "
-"one driver for your card, but where none of them is the default one."
+"If there is no actual default driver for your sound card, there may be other "
+"possible alternative drivers available to choose from. If this is the case, "
+"but you think the installer has not made the most appropriate choice, you "
+"can click on <emphasis>Advanced</emphasis> to manually specify a driver."
 msgstr ""
-"安装器将会使用默认驱动（如果有的话）。只有存在多个可用驱动（且均不是默认驱"
-"动）时，才会提示您进行选择。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:137
-msgid "<guilabel>Graphical interface</guilabel>:"
-msgstr "<guilabel>图形界面</guilabel>:"
+#: en/misc-params.xml:144
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical interface</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:140
-msgid "This section allows you to configure your graphic card(s) and displays."
+#: en/misc-params.xml:146
+#, fuzzy
+msgid ""
+"This section allows you to configure your graphics card(s) and displays. For "
+"more information, see <xref linkend=\"configureX_chooser\"/>"
 msgstr "您可以在这里配置显卡和显示器。"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:143
-msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
-msgstr "更多信息，参见 <xref linkend=\"configureX_chooser\"/>."
-
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:149
+#: en/misc-params.xml:155
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
@@ -2882,29 +3017,30 @@ msgstr ""
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:157
+#: en/misc-params.xml:163
 msgid "Network and Internet parameters"
 msgstr "网络和 Internet 参数"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
-msgid "<guilabel>Network</guilabel>:"
-msgstr "<guilabel>网络</guilabel>:"
+#: en/misc-params.xml:169
+#, fuzzy
+msgid "<emphasis role=\"bold\">Network</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:165
+#: en/misc-params.xml:171
 #, fuzzy
 msgid ""
 "You can configure your network here, but for network cards with non-free "
-"drivers it is better to do that after reboot, using the <application>Mageia "
-"Control Center</application>, if you have not yet enabled the Nonfree media "
+"drivers it is better to do that after reboot, using the Mageia Control "
+"Center, if you have not yet enabled the <emphasis>Nonfree</emphasis> media "
 "repositories."
 msgstr ""
 "您可以在这里配置网络。若您需要在网卡上使用非自由的驱动程序，并且尚未启用 "
 "Nonfree 软件仓库，那么您最好等到重启后再进行这一操作。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:172
+#: en/misc-params.xml:178
 #, fuzzy
 msgid ""
 "When you add a network card, do not forget to set your firewall to monitor "
@@ -2912,75 +3048,86 @@ msgid ""
 msgstr "当您添加了网卡后，请不要忘记用防火墙对该接口进行管理。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
-msgid "<guilabel>Proxies</guilabel>:"
-msgstr "<guilabel>代理</guilabel>："
+#: en/misc-params.xml:185
+#, fuzzy
+msgid "<emphasis role=\"bold\">Proxies</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:181
+#: en/misc-params.xml:187
+#, fuzzy
 msgid ""
 "A Proxy Server acts as an intermediary between your computer and the wider "
-"internet.  This section allows you to configure your computer to utilize a "
+"Internet.  This section allows you to configure your computer to utilize a "
 "proxy service."
 msgstr ""
 "代理服务器将作为您的电脑和广域网之间的桥梁。您可以在此处配置您需要使用的代理"
 "服务。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:186
+#: en/misc-params.xml:192
 #, fuzzy
 msgid ""
-"You may need to consult your systems administrator to get the parameters you "
-"need to enter here."
+"You may need to consult your systems administrator to obtain the parameters "
+"you need to enter here."
 msgstr "您可能需要咨询系统管理员来获取此处应当填写的参数"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:195
+#: en/misc-params.xml:201
 msgid "Security"
 msgstr "安全"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:200
-msgid "<guilabel>Security Level</guilabel>:"
-msgstr "<guilabel>安全等级</guilabel>："
+#: en/misc-params.xml:206
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Level</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:203
+#: en/misc-params.xml:208
+#, fuzzy
 msgid ""
-"Here you set the Security level for your computer, in most cases the default "
-"setting (Standard) is adequate for general use."
+"The Security level for your computer, in most cases the default setting "
+"(Standard)  is adequate for general use. Select the option which best suits "
+"your usage."
 msgstr "您可以在这里设置计算机的安全等级，一般情况下可以使用默认设置（标准）。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:207
-msgid "Check the option which best suits your usage."
-msgstr "请勾选您认为合适的选项。"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
-msgid "<guilabel>Firewall</guilabel>:"
-msgstr "<guilabel>防火墙</guilabel>："
+#: en/misc-params.xml:215
+#, fuzzy
+msgid "<emphasis role=\"bold\">Firewall</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:214
+#: en/misc-params.xml:217
 msgid ""
-"A firewall is intended to be a barrier between your important data and the "
-"rascals out there on the internet who would compromise or steal it."
-msgstr "防火墙将保护您的重要数据，以免其被他人恶意利用或窃取。"
+"The firewall allows you to manage which network connections are allowed on "
+"your computer. The safe and secure default is to allow ZERO inbound "
+"connections. This does not stop you connecting outbound and using your "
+"computer normally."
+msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:218
+#: en/misc-params.xml:223
 msgid ""
-"Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for. For more "
-"information, see <xref linkend=\"firewall\"/>."
+"Please be aware that the Internet is a high risk network where there are "
+"continuous attempts to probe and attack systems. Even seemingly <quote>safe</"
+"quote> connections such as ICMP (for ping) have been used as covert data "
+"channels for exfiltrating data by malicious persons."
 msgstr ""
-"选择您需要使用的服务，这取决与您希望如何使用您的计算机。有关更多信息，请参见 "
-"<xref linkend=\"firewall\"/>。"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/misc-params.xml:229
+#, fuzzy
+msgid "For more information, see <xref linkend=\"firewall\"/>."
+msgstr "更多信息，参见 <xref linkend=\"configureX_chooser\"/>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:224
-msgid "Bear in mind that allowing everything (no firewall) may be very risky."
+#: en/misc-params.xml:232
+#, fuzzy
+msgid ""
+"Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may "
+"be very risky."
 msgstr "请牢记：允许所有服务（即不启用防火墙）是非常危险的。"
 
 #. type: Content of: <section><info><title>
@@ -2989,34 +3136,49 @@ msgid "Reboot"
 msgstr "重新启动"
 
 #. type: Content of: <section><para>
-#: en/reboot.xml:6
+#: en/reboot.xml:7
+#, fuzzy
 msgid ""
 "Once the bootloader has been installed, you will be prompted to halt your "
-"computer, remove the live CD and restart the computer, click on <emphasis "
-"role=\"bold\"><guibutton>Finish</guibutton></emphasis> and act as "
-"asked<emphasis role=\"bold\"> in this order!</emphasis>"
+"computer, remove the live DVD/USB stick and restart the computer."
 msgstr ""
 "一旦安装了引导器，安装程序将会提示您重启电脑，此时请移除 Live CD 并重启。请点"
 "击<emphasis role=\"bold\"><guibutton>完成</guibutton></emphasis>并<emphasis "
 "role=\"bold\">根据提示的步骤</emphasis>进行操作。"
 
+#. type: Content of: <section><important><simpara>
+#: en/reboot.xml:9
+msgid ""
+"Ensure that you follow these shut-down and restart instruction steps in the "
+"<emphasis role=\"bold\">same</emphasis> order."
+msgstr ""
+
 #. type: Content of: <section><mediaobject>
-#: en/reboot.xml:11
-msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
+#: en/reboot.xml:12
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot2.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
 
-#. type: Content of: <section><para>
-#: en/reboot.xml:15
+#. type: Content of: <section><simpara>
+#: en/reboot.xml:16
+msgid "When you are ready, press <emphasis>Finish</emphasis>."
+msgstr ""
+
+#. type: Content of: <section><simpara>
+#: en/reboot.xml:17
+#, fuzzy
 msgid ""
 "When you restart, you will see a succession of download progress bars. These "
-"indicate that the software media lists are being downloaded (see Software "
-"management)."
+"indicate that the software media lists are being downloaded (see "
+"<emphasis>Software Management</emphasis>)."
 msgstr ""
 "重启后，您将会看到一系列下载进度条，它将提示您正在下载的软件媒体（参见“软件管"
 "理”）。"
 
 #. type: Content of: <section><mediaobject>
-#: en/reboot.xml:17
+#: en/reboot.xml:19
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
 "reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
@@ -3045,46 +3207,52 @@ msgstr ""
 "<application>Mageia</application>）。"
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:3
+#: en/securityLevel.xml:10
 msgid "Security Level"
 msgstr "安全级别"
 
 #.  2012-12-25 marja - moved this part out of misc-params.xml" 
 #.  2013-05-05 marja - added screenshot 
+#. 2018/02/12 apb: Minor wording.
 #. type: Content of: <section><mediaobject>
-#: en/securityLevel.xml:11
+#: en/securityLevel.xml:20
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" align="
-"\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-securityLevel.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"securityLevel-im1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
-"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:16
+#: en/securityLevel.xml:26
 #, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
 msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:19
+#: en/securityLevel.xml:29
+msgid ""
+"<emphasis>Standard</emphasis> is the default, and recommended setting for "
+"the average user."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:32
 msgid ""
-"<emphasis role=\"bold\">Standard</emphasis> is the default, and recommended "
-"setting for the average user. The <emphasis role=\"bold\">Secure</emphasis> "
-"setting will create a highly protected system - for instance if the system "
-"is to be used as a public server."
+"<emphasis>Secure</emphasis> will create a highly protected system - for "
+"instance if the system is to be used as a public server."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:24
+#: en/securityLevel.xml:36
 #, fuzzy
 msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
 msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:26
+#: en/securityLevel.xml:38
 msgid ""
 "This item allows you to configure an email address to which the system will "
 "send <emphasis>security alert messages</emphasis> when it detects situations "
@@ -3092,14 +3260,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:31
+#: en/securityLevel.xml:43
 msgid ""
-"A good, and easy-to-implement, choice is to enter &lt;user>@localhost - "
-"where &lt;user> is the login name of the user to receive these messages."
+"A good, and easy-to-implement, choice is to enter &lt;user&gt;@localhost - "
+"where &lt;user&gt; is the login name of the user to receive these messages."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/securityLevel.xml:36
+#: en/securityLevel.xml:48
 msgid ""
 "The system sends such messages as <emphasis role=\"bold\">Unix Mailspool "
 "messages</emphasis>, not as \"ordinary\" SMTP mail: this user must therefore "
@@ -3107,27 +3275,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:41
+#: en/securityLevel.xml:53
 #, fuzzy
 msgid ""
-"After install, it will always be possible to adjust your security settings "
-"in the <guilabel>Security</guilabel> section of the Mageia Control Center."
+"It will always be possible to adjust your security settings post-install in "
+"the <emphasis>Security</emphasis> section of the Mageia Control Center."
 msgstr ""
 "在安装之后，您也可以在 Mageia 控制中心中的 <guilabel>安全</guilabel> 选项卡里"
 "调整安全设置。"
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:6
+#: en/SelectAndUseISOs2.xml:15
 msgid "Select and use ISOs"
 msgstr "选择和使用 ISO"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:18
 msgid "Introduction"
 msgstr "简介"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:10
+#: en/SelectAndUseISOs2.xml:19
 #, fuzzy
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
@@ -3135,58 +3303,103 @@ msgid ""
 msgstr "Mageia 通过 ISO 镜像进行分发。此页将帮助您选择所需的镜像。"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:12
+#: en/SelectAndUseISOs2.xml:21
 #, fuzzy
-msgid "There are two families of media:"
+msgid "There are three types of installation media:"
 msgstr "有两种类型的媒介："
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:15
+#: en/SelectAndUseISOs2.xml:24
 #, fuzzy
 msgid ""
-"Classical installer: Booting with this media provides you with the maximum "
-"flexibility when choosing what to install, and for configuring your system. "
-"In particular, you have a choice of which Desktop environment to install"
+"<emphasis role=\"bold\">Classical installer:</emphasis> Booting with this "
+"media provides you with the maximum flexibility when choosing what to "
+"install, and for configuring your system. In particular, you have a choice "
+"of which Desktop environment to install."
 msgstr ""
 "传统安装器：在引导之后，程序将提供一系列用于安装和配置目标系统的选项。这种安"
 "装类型可以给予您最大限度的灵活性，尤其是选择所需安装的桌面环境。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:21
+#: en/SelectAndUseISOs2.xml:31
+msgid ""
+"<emphasis role=\"bold\">LIVE media:</emphasis> This option allows you to try "
+"out Mageia without having to actually install it, or make any changes to "
+"your computer. However, the Live media also includes an Installer, which can "
+"be started when booting the media, or after booting into the Live operating "
+"system itself."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><note><para>
+#: en/SelectAndUseISOs2.xml:37
+msgid ""
+"The Live Installer is simpler compared to the Classical Installer - but you "
+"have fewer configuration options."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><important><para>
+#: en/SelectAndUseISOs2.xml:41
+#, fuzzy
+msgid ""
+"Live ISOs can only be used to create <quote>clean</quote> installations, "
+"they cannot be used to upgrade previously installed Mageia releases."
+msgstr ""
+"<emphasis role=\"bold\">Live ISO 仅能用于全新安装，而无法对之前的版本进行升"
+"级。</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:47
+#, fuzzy
 msgid ""
-"LIVE media: This option allows you to try out Mageia without having to "
-"actually install it, or make any changes to your computer.  If the "
-"installation is decided, the process is simpler, but you get fewer choices "
-"than offered by the Classical installer"
+"<emphasis role=\"bold\">Net Install</emphasis>: These are minimal ISO's "
+"containing no more than that which is needed to start the DrakX installer "
+"and find <literal>DrakX-installer-stage2</literal> and other packages that "
+"are needed to continue and complete the install. These packages may be on "
+"the PC hard disk, on a local drive, on a local network or on the Internet."
 msgstr ""
+"此类媒介仅包含启动 drakx 安装器和查找 drakx-installer-stage2 等软件包所必须的"
+"程序，因此非常轻巧。用于后续安装的软件包可以位于电脑硬盘、本地驱动器、本地网"
+"络或互联网。"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:53
+#, fuzzy
+msgid ""
+"These media are very light (less than 100 MB) and are convenient if "
+"bandwidth is too low to download a full DVD, or if you have a PC without a "
+"DVD drive or is unable to boot from a USB stick."
+msgstr ""
+"这类媒介非常小巧（小于 100 MB），适用于不方便下载完整版 DVD、没有 DVD 驱动器"
+"或不支持 USB 引导的电脑。"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:27
-msgid "Details are given in the next sections."
+#: en/SelectAndUseISOs2.xml:58
+#, fuzzy
+msgid "More details are given in the next sections."
 msgstr "下一节中将涉及有关细节。"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:30
+#: en/SelectAndUseISOs2.xml:61
 msgid "Media"
 msgstr "介质"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:32
+#: en/SelectAndUseISOs2.xml:63
 msgid "Definition"
 msgstr "定义"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:64
 #, fuzzy
 msgid ""
 "Here, a medium (plural: media) is an ISO image file that allows you to "
-"install and/or update Mageia and by extension any physical support (DVD, USB "
-"stick, ...) the ISO file is copied to."
+"install and/or update Mageia and, by extension, any physical medium (DVD, "
+"USB stick, ...) the ISO file is copied to."
 msgstr ""
 "媒介：是一类承载 ISO 文件、可以用于安装和/或更新 Mageia 的任意物理介质。"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:36
+#: en/SelectAndUseISOs2.xml:67
 #, fuzzy
 msgid ""
 "You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
@@ -3196,266 +3409,259 @@ msgstr ""
 "到它们。"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:39
+#: en/SelectAndUseISOs2.xml:70
 msgid "Classical installation media"
 msgstr "传统安装媒介"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:41 en/SelectAndUseISOs2.xml:71
-#: en/SelectAndUseISOs2.xml:141
+#: en/SelectAndUseISOs2.xml:72 en/SelectAndUseISOs2.xml:104
+#: en/SelectAndUseISOs2.xml:171
 msgid "Common features"
 msgstr "通用特性"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:44
+#: en/SelectAndUseISOs2.xml:75
 #, fuzzy
-msgid "These ISOs use the Classical installer called drakx."
+msgid "These ISOs use the Classical installer called DrakX"
 msgstr "这些 ISO 使用传统的安装器（drakx）。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:47
+#: en/SelectAndUseISOs2.xml:78
 #, fuzzy
 msgid ""
 "They are used for performing clean installs or to upgrade a previously "
-"installed version of Mageia."
+"installed version of Mageia"
 msgstr "它们可以用于全新安装，或更新之前的版本。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
-#: en/SelectAndUseISOs2.xml:158
+#: en/SelectAndUseISOs2.xml:82 en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:174
 #, fuzzy
-msgid "Different media for 32 and 64 bit architectures."
+msgid "Different media for 32 and 64-bit architectures"
 msgstr "媒介有 32 位和 64 位两种架构之分。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:54
+#: en/SelectAndUseISOs2.xml:85
+#, fuzzy
 msgid ""
-"Some tools are available in the Welcome screen: Rescue System, Memory Test, "
-"Hardware Detection Tool."
+"Some tools are available in the Installer <quote>Welcome</quote> screen: "
+"<emphasis>Rescue System, Memory Test, </emphasis>and <emphasis>Hardware "
+"Detection Tool</emphasis>"
 msgstr "欢迎屏幕中列出了一些可用的工具，如：救援系统、内存测试、硬件检测工具。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:58
-msgid "Each DVD contains many available desktop environments and languages."
+#: en/SelectAndUseISOs2.xml:91
+#, fuzzy
+msgid "Each DVD contains many available desktop environments and languages"
 msgstr "每个 DVD 中包含多种桌面环境和语言支持。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:62
+#: en/SelectAndUseISOs2.xml:95
+#, fuzzy
 msgid ""
-"You'll be given the choice during the installation to add non free software."
+"You'll be given the choice during the installation to add non-free software"
 msgstr "您可以在安装时添加非自由软件。"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:102
 msgid "Live media"
 msgstr "Live 媒介"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:74
+#: en/SelectAndUseISOs2.xml:107
 #, fuzzy
 msgid ""
 "Can be used to preview the Mageia operating system without having to install "
-"it. Can also be used to install Mageia if you wish."
+"it"
 msgstr ""
 "可以用于预览该发行版，而无需将其安装到硬盘上。也可以用于安装 Mageia 至硬盘。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
-msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)."
-msgstr "每个 ISO 仅包含一种桌面环境（KDE Plasma、GNOME 或 Xfce）。"
+#: en/SelectAndUseISOs2.xml:111
+msgid "The Live media also includes an Installer."
+msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:86
+#: en/SelectAndUseISOs2.xml:114
 #, fuzzy
-msgid ""
-"<emphasis role=\"bold\">Live ISOs can only be used to create clean "
-"installations, they cannot be used to upgrade previously installed Mageia "
-"releases.</emphasis>"
-msgstr ""
-"<emphasis role=\"bold\">Live ISO 仅能用于全新安装，而无法对之前的版本进行升"
-"级。</emphasis>"
+msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)"
+msgstr "每个 ISO 仅包含一种桌面环境（KDE Plasma、GNOME 或 Xfce）。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:91
-msgid "They contain non free software."
+#: en/SelectAndUseISOs2.xml:121
+#, fuzzy
+msgid "They contain non-free software"
 msgstr "其中包含非自由软件。"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:96
+#: en/SelectAndUseISOs2.xml:126
 msgid "Live DVD Plasma"
 msgstr "Live DVD KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:99
-msgid "Plasma desktop environment only."
+#: en/SelectAndUseISOs2.xml:129
+#, fuzzy
+msgid "Plasma desktop environment only"
 msgstr "仅包含 KDE（Plasma）桌面环境。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
-#: en/SelectAndUseISOs2.xml:130
+#: en/SelectAndUseISOs2.xml:132 en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:160
 #, fuzzy
-msgid "All available languages are present."
+msgid "All available languages are present"
 msgstr "包含所有语言支持。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:105
-msgid "64 bit architecture only."
-msgstr "仅支持 64 位处理器。"
+#: en/SelectAndUseISOs2.xml:135 en/SelectAndUseISOs2.xml:149
+#, fuzzy
+msgid "64-bit architecture only"
+msgstr "仅支持 64 位处理器"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:110
+#: en/SelectAndUseISOs2.xml:140
 msgid "Live DVD GNOME"
 msgstr "Live DVD GNOME"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:113
-msgid "GNOME desktop environment only."
+#: en/SelectAndUseISOs2.xml:143
+#, fuzzy
+msgid "GNOME desktop environment only"
 msgstr "仅包含 GNOME 桌面环境。"
 
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:119
-msgid "64 bit architecture only"
-msgstr "仅支持 64 位处理器"
-
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:154
 msgid "Live DVD Xfce"
 msgstr "Live DVD Xfce"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:127
-msgid "Xfce desktop environment only."
+#: en/SelectAndUseISOs2.xml:157
+#, fuzzy
+msgid "Xfce desktop environment only"
 msgstr "仅包含 Xfce 桌面环境。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:133
-msgid "32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:163
+#, fuzzy
+msgid "32 or 64-bit architectures"
 msgstr "同时支持 32 位和 64 位处理器。"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:139
+#: en/SelectAndUseISOs2.xml:169
 #, fuzzy
 msgid "Net install media"
 msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:144
-#, fuzzy
-msgid ""
-"These are minimal ISO's containing no more than that which is needed to "
-"start the drakx installer and find drakx-installer-stage2 and other packages "
-"that are needed to continue and complete the install. These packages may be "
-"on the PC hard disk, on a local drive, on a local network or on the Internet."
-msgstr ""
-"此类媒介仅包含启动 drakx 安装器和查找 drakx-installer-stage2 等软件包所必须的"
-"程序，因此非常轻巧。用于后续安装的软件包可以位于电脑硬盘、本地驱动器、本地网"
-"络或互联网。"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
+#: en/SelectAndUseISOs2.xml:177
 #, fuzzy
-msgid ""
-"These media are very light (less than 100 MB) and are convenient if "
-"bandwidth is too low to download a full DVD, or if you have a PC without a "
-"DVD drive or is unable to boot from a USB stick."
-msgstr ""
-"这类媒介非常小巧（小于 100 MB），适用于不方便下载完整版 DVD、没有 DVD 驱动器"
-"或不支持 USB 引导的电脑。"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:161
-#, fuzzy
-msgid "First steps are English language only."
+msgid "First steps are English language only"
 msgstr "仅包含英语支持。"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:182
 msgid "netinstall.iso"
 msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:169
+#: en/SelectAndUseISOs2.xml:185
+#, fuzzy
 msgid ""
-"Contains only free software, for those people who prefer not to use non-free "
-"software."
+"Contains only free software, for those who prefer to not use non-free "
+"software"
 msgstr "仅包含自由软件，适用于不希望使用非自由软件的人。"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:175
+#: en/SelectAndUseISOs2.xml:191
 msgid "netinstall-nonfree.iso"
 msgstr "netinstall-nonfree.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:178
+#: en/SelectAndUseISOs2.xml:194
+#, fuzzy
 msgid ""
-"Contains non-free software (mostly drivers, codecs...) for people who need "
-"it."
+"Contains non-free software (mostly drivers, codecs...) for those who need it"
 msgstr "包含部分用户所需的非自由软件（主要为驱动、编码器）。"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:186
+#: en/SelectAndUseISOs2.xml:202
 msgid "Downloading and Checking Media"
 msgstr "下载和检查媒介"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:204
 msgid "Downloading"
 msgstr "下载中"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:189
+#: en/SelectAndUseISOs2.xml:205
 #, fuzzy
 msgid ""
 "Once you have chosen your ISO file, you can download it using either http or "
 "BitTorrent. In both cases, you are provided with some information, such as "
-"the mirror in use and an option to switch if the bandwidth is too low. If "
-"http is chosen, you will also see something regarding checksums."
+"the mirror in use and an option to switch to an alternative if the bandwidth "
+"is too low."
 msgstr ""
 "在选择了 ISO 文件后，您可以通过 HTTP 或 BitTorrent 下载它。相应的窗口中将会提"
 "示您正在使用的镜像源，并在速度太慢时提醒您更换镜像源。若您使用 HTTP 方式下"
 "载，您可能会看到类似下列情形"
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:191
-msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:209
+msgid ""
+"If http is chosen you will also see some information regarding checksums."
+msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:195
+#: en/SelectAndUseISOs2.xml:212
+msgid ""
+"<literal>md5sum</literal>, <literal>sha1sum</literal> and "
+"<literal>sha512sum</literal> (the most secure) are tools to check the ISO "
+"integrity. Copy one of the checksums (string of alphanumeric characters) for "
+"use in the next section."
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/SelectAndUseISOs2.xml:217
 #, fuzzy
 msgid ""
-"md5sum and sha1sum are tools to check the ISO integrity. Choose one or the "
-"other, and copy the checksum <link linkend=\"integrity\">for later use</"
-"link>. Then a window similar to this one appears:"
+"<imageobject> <imagedata align=\"center\" fileref=\"Checking.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:222
+msgid "In the meantime, a window to download the actual ISO will open:"
 msgstr ""
-"md5sum 和 sha1sum 是用于检查 ISO 文件完整性的工具，只需使用其中一种即可。请您"
-"保留它们以便<link linkend=\"integrity\">后续使用</link>。之后，窗口将会显示："
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:199
-msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:225
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Download.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:203
-msgid "Select the Save File option, then, click OK."
+#: en/SelectAndUseISOs2.xml:229
+msgid ""
+"Click on <emphasis>Save File</emphasis>, then click <emphasis>OK</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:206
+#: en/SelectAndUseISOs2.xml:233
 msgid "Checking the integrity of the downloaded media"
 msgstr "检查下载文件的完整性"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:208
+#: en/SelectAndUseISOs2.xml:235
 #, fuzzy
 msgid ""
 "The checksums referred to earlier, are digital fingerprints generated by an "
 "algorithm from the file to be downloaded. You may compare the checksum of "
 "your downloaded ISO against that of the original source ISO. If the "
 "checksums do not match, it means that the actual data on the ISO's do not "
-"match, and if it is the case, then you should retry the download or attempt "
-"a repair using BitTorrent."
+"match, and if that is the case, then you should retry the download or "
+"attempt a repair using BitTorrent."
 msgstr ""
 "这两种校验和均由特定算法计算文件内容产生，且均为十六进制数字。当您使用这些算"
 "法来重新计算下载文件的校验值时，如果您得到的结果和 Mageia 提供的一致，说明您"
@@ -3463,7 +3669,7 @@ msgstr ""
 "载。"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#: en/SelectAndUseISOs2.xml:241
 #, fuzzy
 msgid ""
 "To generate the checksum for your downloaded ISO, open a console, (no need "
@@ -3471,118 +3677,138 @@ msgid ""
 msgstr "打开一个终端（无需以 root 身份操作），然后："
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:245
 #, fuzzy
 msgid ""
-"To use md5sum, type: <userinput>md5sum path/to/the/image/file.iso</"
-"userinput>."
+"To use the md5sum, type: <command>md5sum path/to/the/image/file.iso</command>"
 msgstr ""
 "- 若使用 md5sum，请输入：[sam@localhost]$ <userinput>md5sum path/to/the/"
 "image/file.iso</userinput>。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:249
+#, fuzzy
+msgid ""
+"To use the sha1sum, type: <command>sha1sum path/to/the/image/file.iso</"
+"command>"
+msgstr ""
+"- 若使用 sha1sum，请输入：[sam@localhost]$ <userinput>sha1sum path/to/the/"
+"image/file.iso</userinput>。"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:254
 #, fuzzy
 msgid ""
-"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
-"userinput>"
+"To use the sha512sum, type: <command>sha512sum path/to/the/image/file.iso</"
+"command>"
 msgstr ""
 "- 若使用 sha1sum，请输入：[sam@localhost]$ <userinput>sha1sum path/to/the/"
 "image/file.iso</userinput>。"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:226
+#: en/SelectAndUseISOs2.xml:258
 msgid "Example:"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:228
-msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:260
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Md5sum.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:232
+#: en/SelectAndUseISOs2.xml:265
 #, fuzzy
 msgid ""
-"and compare the result (you may have to wait for a while) with the checksum "
-"provided by Mageia."
+"then compare the result (you may have to wait for a while) with the ISO "
+"checksum provided by Mageia."
 msgstr ""
 "然后比较执行结果（可能需要等待一段时间）和 Mageia 网上提供的数值。例如："
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:237
+#: en/SelectAndUseISOs2.xml:270
 msgid "Burn or dump the ISO"
 msgstr "刻录或转储 ISO"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:238
+#: en/SelectAndUseISOs2.xml:271
 #, fuzzy
 msgid ""
-"The verified ISO can now be burned to a CD/DVD or dumped to a USB stick. "
-"This is not a standard copy operation as a bootable medium will actually be "
-"created."
+"The verified ISO can now be burned to a CD/DVD or <quote>dumped</quote> to a "
+"USB stick. This is not a standard copy operation, as a bootable medium will "
+"actually be created."
 msgstr ""
 "经过检查后的 ISO 即可被刻录至 CD/DVD，或写入到 U 盘。这些操作不同于简单的复"
 "制，其目的是创建一个可引导的媒体。"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:275
 msgid "Burning the ISO to a CD/DVD"
 msgstr "将ISO文件刻录到CD或DVD"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:243
+#: en/SelectAndUseISOs2.xml:276
 #, fuzzy
 msgid ""
-"Whichever software you use, ensure that the option to burn an <emphasis role="
-"\"bold\">image</emphasis> is used, burn <emphasis role=\"bold\">data</"
-"emphasis> or <emphasis role=\"bold\">files</emphasis> is not correct. See "
-"<link ns4:href=\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images\">the "
-"Mageia wiki</link> for more information."
+"Whichever software you use, ensure that the option to burn an<emphasis> "
+"image</emphasis> is used. Burn <emphasis>data</emphasis> or <emphasis>files</"
+"emphasis> is NOT correct. See the <link ns4:href=\"https://wiki.mageia.org/"
+"en/Writing_CD_and_DVD_images\">the Mageia wiki</link> for more information."
 msgstr ""
 "您可以刻录任何所需镜像，但请确保刻录设备的模式被设为<emphasis role=\"bold\">"
 "刻录镜像</emphasis>，而非刻录数据或文件。更多信息请见 <link ns4:href="
 "\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images\">Mageia wiki</link>。"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:282
 msgid "Dump the ISO to a USB stick"
 msgstr "写入 ISO 到 U 盘"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:249
+#: en/SelectAndUseISOs2.xml:283
+#, fuzzy
 msgid ""
-"All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
-"and then use it to boot and install the system."
+"All Mageia ISOs are hybrids, which means you can dump them to a USB stick "
+"and then use that to boot and install the system."
 msgstr ""
 "所有的 Mageia  ISO 均为混合类型 ISO，因此您可以将其“转储”到 U 盘中，然后使用 "
 "U 盘来引导和安装系统。"
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:286
 #, fuzzy
 msgid ""
-"\"Dumping\" an image onto a flash device destroys any previous file-system "
-"on the device; any existing data will be lost and the partition capacity "
-"will be reduced to the image size."
+"Dumping an image onto a flash device destroys any previous file-system on "
+"the device and all existing data will be lost."
 msgstr ""
 "“转储”镜像至闪存设备将会破坏设备上原先的文件系统，任何数据都将丢失，并且分区"
 "容量将会（暂时）缩减为镜像大小。"
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:256
+#. type: Content of: <section><section><section><note><para>
+#: en/SelectAndUseISOs2.xml:290
 msgid ""
-"To recover the original capacity, you must redo partitioning and re-format "
-"the USB stick."
-msgstr "若要恢复原始容量，您必须重新进行分区和格式化操作。"
+"Also, the only partition on the flash device will then just be the Mageia "
+"ISO partition."
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/SelectAndUseISOs2.xml:292
+msgid ""
+"So, if an ISO of about 4GB is written to an 8GB USB stick, the stick will "
+"then only show up as 4GB. This is because the remaining 4GB is no longer "
+"formatted - hence not currently available for use. To recover the original "
+"capacity, you must reformat and repartition the USB stick."
+msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:299
 msgid "Using a graphical tool within Mageia"
 msgstr "使用 Mageia 的图形化工具"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:260
+#: en/SelectAndUseISOs2.xml:300
 msgid ""
 "You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
 "en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3592,27 +3818,27 @@ msgstr ""
 "具来操作。"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:263
+#: en/SelectAndUseISOs2.xml:303
 msgid "Using a graphical tool within Windows"
 msgstr "使用 Windows 下的图形化工具"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:304
 msgid "You could try:"
 msgstr "您可以尝试："
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:267
+#: en/SelectAndUseISOs2.xml:307
 #, fuzzy
 msgid ""
 "<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
-"\"ISO image\" option;"
+"\"ISO image\" option"
 msgstr ""
 "- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> 中"
 "的“ISO 镜像”选项；"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:271
+#: en/SelectAndUseISOs2.xml:311
 #, fuzzy
 msgid ""
 "<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
@@ -3622,12 +3848,13 @@ msgstr ""
 "Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:277
-msgid "Using Command line within a GNU/Linux system"
+#: en/SelectAndUseISOs2.xml:317
+#, fuzzy
+msgid "Using the Command line within a GNU/Linux system"
 msgstr "使用 GNU/Linux 系统中的命令行程序"
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:279
+#: en/SelectAndUseISOs2.xml:319
 #, fuzzy
 msgid ""
 "It is potentially *dangerous* to do this by hand. You risk overwriting "
@@ -3637,65 +3864,73 @@ msgstr ""
 "据。"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:325
 msgid "Open a console"
 msgstr "打开一个终端"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:328
 #, fuzzy
 msgid ""
-"Become a root (Administrator) user with the command <userinput>su -</"
-"userinput> (don't forget the final '-' )"
+"Become a <emphasis>root</emphasis> (Administrator) user with the command "
+"<command>su -</command> (don't forget the <command>-</command> )"
 msgstr ""
 "使用命令 <userinput>su -</userinput> 获取 root 权限（不要漏掉末尾的“-”）"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
-msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:332
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Root.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:297
+#: en/SelectAndUseISOs2.xml:338
+#, fuzzy
 msgid ""
-"Plug in your USB stick (do not mount it, this also means do not open any "
-"application or file manager that could access or read it)"
+"Plug in your USB stick - but do not mount it (this also means do not open "
+"any application or file manager that could access or read it)"
 msgstr "插入您的 U 盘（无需挂载，并且不要用任何应用程序或文件管理器访问它）"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:302
-msgid "Enter the command <userinput>fdisk -l</userinput>"
+#: en/SelectAndUseISOs2.xml:343
+#, fuzzy
+msgid "Enter the command <command>fdisk -l</command>"
 msgstr "输入命令 <userinput>fdisk -l</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
-msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:345
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Fdisk.png\"/> </"
+"imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:310
+#: en/SelectAndUseISOs2.xml:351
 #, fuzzy
 msgid ""
-"Find the device name for your USB stick (by its size), for example <code>/"
-"dev/sdb</code> in the screenshot above, it is an 8GB USB stick."
+"Find the device name for your USB stick (by its size), for example "
+"<filename>/dev/sdb</filename> in the screenshot above, is an 8GB USB stick."
 msgstr ""
 "通过磁盘大小来确认您的 U 盘的设备名，例如图中所示的 <code>/dev/sdb</code>，是"
 "一个 8GB 的 U 盘。"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:354
 #, fuzzy
 msgid ""
-"Alternatively, you can find the device name with the command <code>dmesg</"
-"code>: towards the end of this example, you can see the device name starting "
-"with <emphasis>sd</emphasis>, and in this case, <emphasis>sdd</emphasis> is "
-"the actual device. You can also see that its size is 2GB:"
+"Alternatively, you can find the device name with the command <command>dmesg</"
+"command>. Towards the end of the following example, you can see the device "
+"name starting with <filename>sd</filename>, and in this case, <filename>sdd</"
+"filename> is the actual device. You can also see that its size is 2GB:"
 msgstr ""
 "或者，您也可以通过命令 <code>dmesg</code> 来查看设备名：在输入末尾，您将看到"
 "以 <emphasis>sd</emphasis> 开头的设备名，如 <emphasis>sdd</emphasis>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para><screen>
-#: en/SelectAndUseISOs2.xml:317
+#: en/SelectAndUseISOs2.xml:360
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3737,52 +3972,56 @@ msgstr ""
 "[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:317
+#: en/SelectAndUseISOs2.xml:360
 #, fuzzy
 msgid "<placeholder type=\"screen\" id=\"0\"/>"
 msgstr "<placeholder type=\"info\" id=\"0\"/>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:337
+#: en/SelectAndUseISOs2.xml:380
 #, fuzzy
 msgid ""
-"Enter the command: <emphasis role=\"bold\"># <userinput>dd if=path/to/the/"
-"ISO/file of=/dev/sdX bs=1M</userinput></emphasis>"
+"Enter the command: <command>dd if=path/to/the/ISO/file of=/dev/"
+"sd<replaceable>X</replaceable> bs=1M</command>"
 msgstr ""
 "输入命令：# <userinput>dd if=ISO文件的完整路径 of=/dev/sdX bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:340
+#: en/SelectAndUseISOs2.xml:382
 #, fuzzy
-msgid "Where X=your device name eg: /dev/sdd"
+msgid ""
+"Where <replaceable>X</replaceable>=your device name eg: <filename>/dev/sdd</"
+"filename>"
 msgstr "其中，“X”是您的设备名（如：/dev/sdc）"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:341
+#: en/SelectAndUseISOs2.xml:384
 #, fuzzy
 msgid ""
-"Example:<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/"
-"Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
+"Example:<literal> dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/dev/"
+"sdd bs=1M</literal>"
 msgstr ""
 "示例：# <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/"
 "dev/sdb bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><tip><para>
-#: en/SelectAndUseISOs2.xml:345
+#: en/SelectAndUseISOs2.xml:388
 msgid ""
-"It might helpful to know that <emphasis role=\"bold\">if</emphasis> stands "
-"for <emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold\">f</"
-"emphasis>ile and <emphasis role=\"bold\">of</emphasis> stands for <emphasis "
-"role=\"bold\">o</emphasis>utput <emphasis role=\"bold\">f</emphasis>ile"
+"It might be helpful to know that <emphasis role=\"bold\">if</emphasis> "
+"stands for <emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold"
+"\">f</emphasis>ile and <emphasis role=\"bold\">of</emphasis> stands for "
+"<emphasis role=\"bold\">o</emphasis>utput <emphasis role=\"bold\">f</"
+"emphasis>ile"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:349
-msgid "Enter the command: # <userinput>sync</userinput>"
+#: en/SelectAndUseISOs2.xml:392
+#, fuzzy
+msgid "Enter the command: <command>sync</command>"
 msgstr "输入命令：# <userinput>sync</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:352
+#: en/SelectAndUseISOs2.xml:395
 msgid "This is the end of the process, and you may now unplug your USB stick."
 msgstr ""
 
@@ -3792,8 +4031,10 @@ msgid "Select your Country / Region"
 msgstr "选择您所在的国家/地区"
 
 #.  Lebarhon 2016 12 16 updated for Mageia 6
+#. 2018/02/13 apb: Minor wording + typography.
+#. 2018/02/25 apb: a) add xreflabel to this section. b) make some text bulleted.
 #. type: Content of: <section><mediaobject>
-#: en/selectCountry.xml:9
+#: en/selectCountry.xml:13
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
 "\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
@@ -3801,48 +4042,48 @@ msgstr ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
 "\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 
-#. type: Content of: <section><para>
-#: en/selectCountry.xml:14
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectCountry.xml:20
+#, fuzzy
 msgid ""
-"Select your country or region.  This is important for all kinds of settings, "
+"Select your country or region. This is important for all kinds of settings, "
 "like the currency and wireless regulatory domain. Setting the wrong country "
-"can lead to not being able to use a Wireless network."
+"can lead to being unable to use a Wireless network."
 msgstr ""
 "请选择您所在的国家或地区。此选项将影响货币设置和无线管理域设置。如果您设置了"
 "错误的国家，您可能无法正常使用无线网络。"
 
-#. type: Content of: <section><para>
-#: en/selectCountry.xml:19
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectCountry.xml:27
 #, fuzzy
 msgid ""
-"If your country isn't in the list, click the <guilabel>Other Countries</"
-"guilabel> option and choose your country / region there."
+"If your country isn't in the list, click the <emphasis>Other Countries</"
+"emphasis> option and choose your country / region there."
 msgstr ""
 "若列表中不包含您的国家，请点击 <guilabel>其他国家</guilabel> 按钮并选择相应的"
 "国家/区域。"
 
 #. type: Content of: <section><note><para>
-#: en/selectCountry.xml:24
+#: en/selectCountry.xml:34
 #, fuzzy
 msgid ""
-"If your country is only in the <guilabel>Other Countries</guilabel> list, "
-"after clicking <guibutton>OK</guibutton> it may seem that a country from the "
-"first list was chosen. Please ignore this, as DrakX will apply your actual "
-"choice."
+"If your country is only in the <emphasis>Other Countries</emphasis> list, "
+"after clicking <emphasis>OK</emphasis> it may seem that a country from the "
+"main list was chosen. Despite this, DrakX will actually apply your choice."
 msgstr ""
 "若您的国家仅在 <guilabel>其他国家</guilabel> 列表中列出，在点击 <guibutton>确"
 "定</guibutton> 按钮之后，请忽略前一个列表中的选项。DrakX 会应用您后来的选择。"
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:33
+#: en/selectCountry.xml:42
 msgid "Input method"
 msgstr "输入法"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:36
+#: en/selectCountry.xml:45
 #, fuzzy
 msgid ""
-"In the <guilabel>Other Countries</guilabel> screen you can also select an "
+"In the <emphasis>Other Countries</emphasis> screen you can also select an "
 "input method (at the bottom of the list). Input methods allow users to input "
 "multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
 "default input method, so users should not need to configure it manually. "
@@ -3855,136 +4096,125 @@ msgstr ""
 "能，您可以在选择软件包前通过添加 HTTP/FTP 媒体来安装它们。"
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:45
+#: en/selectCountry.xml:54
 #, fuzzy
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via <emphasis role=\"bold\">Configure "
-"your Computer</emphasis> -> <emphasis role=\"bold\">System</emphasis>, or by "
-"running localedrake as root."
+"post-install via <menuchoice> <guimenu>Configure your Computer</guimenu> "
+"<guimenuitem>System</guimenuitem> </menuchoice>, or by running "
+"<command>localedrake</command> as <emphasis>root</emphasis>."
 msgstr ""
 "若您在安装期间缺少输入法，您可以在安装完成后通过“配置我的电脑”->“系统”设置来"
 "安装输入法，或者以 root 身份运行 localedrake。"
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:14
+#: en/selectInstallClass.xml:29
 msgid "Install or Upgrade"
 msgstr "新安装或升级"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectInstallClass.xml:18
+#: en/selectInstallClass.xml:33
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
-"selectInstallClass.png\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectInstallClass."
+"png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
 "\" /> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:25
-msgid "Install"
-msgstr "安装"
+#: en/selectInstallClass.xml:41
+#, fuzzy
+msgid "<emphasis role=\"bold\">Install</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:27
+#: en/selectInstallClass.xml:43
 msgid ""
-"Use this option to perform a fresh installation of <application>Mageia</"
-"application>. This will format the root partition (/), but can preserve a "
-"separated /home partition."
+"Use this option to perform a fresh installation of Mageia. This will format "
+"the <literal>root</literal> partition (<filename>/</filename>), but can "
+"preserve a pre-existing <filename>/home</filename> partition (a dedicated /"
+"home partition, rather than being incorporated within the root (/) partition "
+"itself)."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:33
-msgid "Upgrade"
-msgstr "升级"
+#: en/selectInstallClass.xml:50
+#, fuzzy
+msgid "<emphasis role=\"bold\">Upgrade</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:35
-msgid ""
-"This can be used to upgrade an existing installation of <application>Mageia</"
-"application>."
-msgstr ""
+#: en/selectInstallClass.xml:52
+#, fuzzy
+msgid "Use this option to upgrade an existing installation of Mageia."
+msgstr "使用此选项来进行全新 <application>Mageia</application> 安装。"
 
-#. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:39
+#. type: Content of: <section><important><para>
+#: en/selectInstallClass.xml:58
 #, fuzzy
 msgid ""
 "Only upgrading from a previous Mageia version that was <emphasis>still "
-"supported</emphasis> when this installer's version was released, has been "
+"supported</emphasis> when this Installer's version was released, has been "
 "thoroughly tested. If you want to upgrade a Mageia version that has reached "
-"its End Of Life, then it is better to do a clean install instead while "
-"preserving your <literal>/home</literal> partition."
+"its <quote>End Of Life</quote> then it is better to do a <quote>clean</"
+"quote> install instead, while preserving your <filename>/home</filename> "
+"partition."
 msgstr ""
 "我们只测试了从当前 <emphasis>尚被支持</emphasis>的发行版进行的升级过程。如果"
 "您希望从已经结束支持的 Mageia 版本升级到最新版本，我们建议您最好进行全新安"
 "装，同时保留您的 <literal>/home</literal> 分区。"
 
-#. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:50
-#, fuzzy
-msgid ""
-"If during install you decide to stop the installation, it is possible to "
-"reboot, but please think twice before you do this. Once a partition has been "
-"formatted or updates have started to be installed, your computer isn't in "
-"the same state anymore and rebooting it could very well leave you with an "
-"unusable system. If in spite of that, and only if you are very sure "
-"rebooting is what you want, go to a text terminal by pressing <guilabel>Alt "
-"Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl "
-"Delete</guilabel> simultaneously to reboot."
-msgstr ""
-"若安装过程在某一步中断，您可以选择重启，但请三思而后行。一旦分区被格式化，或"
-"升级过程开始，电脑中的内容将发生变化，此时重启可能导致系统无法使用。若您确定"
-"要重启，可以按 <guibutton>Alt Ctrl F2</guibutton> 切换到终端，然后按下 "
-"<guibutton>Alt Ctrl Delete</guibutton> 来触发重启操作。"
-
 #. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:62
+#: en/selectInstallClass.xml:67
 #, fuzzy
 msgid ""
 "If you have discovered that you forgot to select an additional language, you "
-"can return from the <emphasis role=\"bold\">Install or Upgrade</emphasis> "
-"screen to the language choice screen by pressing <guilabel>Alt Ctrl Home</"
-"guilabel> simultaneously. <emphasis role=\"bold\">Do not</emphasis> do this "
-"later in the install."
+"can return from the <emphasis>Install or Upgrade</emphasis> screen to the "
+"language choice screen by pressing <keycombo> <keycap>Ctrl</keycap> "
+"<keycap>Alt</keycap> <keycap>Home</keycap> </keycombo>. Do<emphasis role="
+"\"bold\"> NOT</emphasis> do this later in the install."
 msgstr ""
 "若您忘记选择某一附加语言，您可以回到“安装或升级”界面，然后按下来 "
 "<guilabel>Alt Ctrl Home</guilabel> 并进行选择。请<emphasis>不要</emphasis>在"
 "安装后再进行添加。"
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboardLive.xml:3
-msgid "Select keyboard"
+#: en/selectKeyboardLive.xml:14
+#, fuzzy
+msgid "Select Keyboard"
 msgstr "选择键盘"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectKeyboardLive.xml:7
+#: en/selectKeyboardLive.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata xml:id=\"selectKeyboardLive-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> </"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-selectKeyboard.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"selectKeyboardLive-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata xml:id=\"selectKeyboardLive-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
+
+#. type: Content of: <section><para>
+#: en/selectKeyboardLive.xml:24
+msgid "Here you can set the keyboard layout you wish to use with Mageia​​."
+msgstr ""
 
 #. type: Content of: <section><para>
-#: en/selectKeyboardLive.xml:12
+#: en/selectKeyboardLive.xml:27
 msgid ""
-"You will be required to set the keyboard layout you wish to use in Mageia​​. "
-"The default one is selected according to your language and timezone "
-"previously selected."
+"A suggested keyboard layout (highlighted), has been chosen for you based "
+"upon your previously selected language and timezone choices."
 msgstr ""
-"您需要选择在 Mageia 中使用的键盘布局。默认布局已根据您之前的语言和时区设置进"
-"行选择。"
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:7
+#: en/selectKeyboard.xml:20
 msgid "Keyboard"
 msgstr "键盘"
 
 #. type: Content of: <section><para>
-#: en/selectKeyboard.xml:10
+#: en/selectKeyboard.xml:23
 msgid ""
 "DrakX selects an appropriate keyboard for your language. If no suitable "
 "keyboard is found it will default to a US keyboard layout."
@@ -3993,17 +4223,17 @@ msgstr ""
 "键盘。"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectKeyboard.xml:15
+#: en/selectKeyboard.xml:28
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png\"/"
 "> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:22
+#: en/selectKeyboard.xml:35
 msgid ""
 "Make sure that the selection is correct or choose another keyboard layout. "
 "If you don't know which layout your keyboard has, look in the specifications "
@@ -4018,30 +4248,30 @@ msgstr ""
 "Keyboard_layout</link>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:31
+#: en/selectKeyboard.xml:45
 #, fuzzy
 msgid ""
-"If your keyboard isn't in the list shown, click on <guibutton>More</"
-"guibutton> to get a fuller list, and select your keyboard there."
+"If your keyboard isn't in the list shown, click on <emphasis>More</emphasis> "
+"to get a fuller list, and select your keyboard there."
 msgstr ""
 "若列表中没有您的键盘，请点击 <guibutton>更多</guibutton> 来查看完整列表，并选"
 "择相应的键盘种类。"
 
-#. type: Content of: <section><itemizedlist><listitem><para><warning><para>
-#: en/selectKeyboard.xml:36
+#. type: Content of: <section><itemizedlist><listitem><para><note><para>
+#: en/selectKeyboard.xml:50
 #, fuzzy
 msgid ""
-"After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
-"you'll return to the first keyboard choice dialog and it will seem as though "
-"a keyboard from that screen was chosen. You can safely ignore this and "
-"continue the installation: the keyboard chosen from the full list will be "
-"applied."
+"After choosing a keyboard from the <emphasis>More</emphasis> dialogue, "
+"you'll return to the first keyboard choice dialogue and it will seem as "
+"though a keyboard from that screen was chosen. You can safely ignore this "
+"and continue the installation: the keyboard chosen from the full list will "
+"be applied."
 msgstr ""
 "在点击 <guibutton>确定</guibutton> 按钮之后，请忽略前一个列表中的选项。DrakX "
 "会应用您后来的选择。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:46
+#: en/selectKeyboard.xml:60
 #, fuzzy
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
@@ -4052,100 +4282,101 @@ msgstr ""
 "的提示窗口。"
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:34
 msgid "Please choose a language to use"
 msgstr "请选择要使用的语言"
 
-#. type: Content of: <section><para>
-#: en/selectLanguage.xml:18
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:39
+#, fuzzy
 msgid ""
 "Select your preferred language, by first expanding the list for your "
-"continent. <application>Mageia</application> will use this selection during "
-"the installation and for your installed system."
+"continent. Mageia will use this selection during the installation and for "
+"your installed system."
 msgstr ""
 "请在地区列表中选择您的首选语言。<application>Mageia</application> 将会在之后"
 "的安装过程中使用该语言。"
 
-#. type: Content of: <section><para>
-#: en/selectLanguage.xml:23
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:45
 #, fuzzy
 msgid ""
-"Select your preferred language.  <application>Mageia</application> will use "
-"this selection during the installation and for your installed system."
+"Select your preferred language. Mageia will use this selection during the "
+"installation and for your installed system."
 msgstr ""
 "请在地区列表中选择您的首选语言。<application>Mageia</application> 将会在之后"
 "的安装过程中使用该语言。"
 
-#. type: Content of: <section><para>
-#: en/selectLanguage.xml:27
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:50
 #, fuzzy
 msgid ""
 "If it is likely that you (or others) will require several languages to be "
-"installed on your system, then you should use the <guibutton>Multiple "
-"languages</guibutton> option to add them now. It will be difficult to add "
+"installed on your system, then you should use the <emphasis>Multiple "
+"languages</emphasis> option to add them now. It will be difficult to add "
 "extra language support after installation."
 msgstr ""
 "若您需要在系统中安装多种语言（为您和其他用户），请现在点击<guibutton>多语言</"
 "guibutton>按钮来添加语言。完成安装后添加额外语言是相对困难的。"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:33
+#: en/selectLanguage.xml:58
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata align=\"center\" fileref=\"live-language.png"
+"\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:43
+#. type: Content of: <section><important><para>
+#: en/selectLanguage.xml:68
 #, fuzzy
 msgid ""
 "Even if you choose more than one language, you must first choose one as your "
-"preferred language in the first language screen. It will also be marked as "
-"chosen in the multiple languages screen."
+"preferred language from the main list of languages. It will also be marked "
+"as chosen in the <emphasis>Multiple languages</emphasis> screen."
 msgstr ""
 "如果您选择了多种语言，必须同时选择其中一种作为您的首选语言（在前一个语言选择"
 "界面中），该语言会同时出现在多语言配置界面中。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:50
+#: en/selectLanguage.xml:76
+#, fuzzy
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
-"it is advisable to install the language of your keyboard as well."
+"it is advisable to install the required language for your keyboard as well"
 msgstr "若您的键盘输入语言与首选语言不同，最好也同时安装该输入语言。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:56
-msgid "Mageia uses UTF-8 (Unicode) support by default."
-msgstr "Mageia 默认使用 UTF-8（Unicode）格式。"
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:58
+#: en/selectLanguage.xml:82
 #, fuzzy
 msgid ""
-"This may be disabled in the <emphasis role=\"bold\">Multiple languages</"
-"emphasis> screen if you know that it is inappropriate for your language. "
-"Disabling UTF-8 applies to all installed languages."
+"Mageia uses UTF-8 (Unicode) support by default. This may be disabled in the "
+"<emphasis>Multiple languages</emphasis> screen if you know that it is "
+"inappropriate for your language. Disabling UTF-8 applies to all installed "
+"languages."
 msgstr ""
 "若您认为这不适合您的语言，可以在“多语言”界面中将其禁用。该操作将应用到所有安"
 "装的语言。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:64
+#: en/selectLanguage.xml:89
+#, fuzzy
 msgid ""
-"You can change the language of your system after installation in the Mageia "
-"Control Center -> System -> Manage localization for your system."
+"You can change the language for your system post-installation in the "
+"<menuchoice> <guimenu>Mageia Control Center</guimenu> <guimenuitem>System</"
+"guimenuitem> <guimenuitem>localization for your system</guimenuitem> </"
+"menuchoice>."
 msgstr ""
 "您可以在安装完成后，在 Mageia 控制中心 -> 系统 -> 管理本地化 中改变系统语言。"
 
 #. type: Content of: <section><info><title>
-#: en/selectMouse.xml:4
+#: en/selectMouse.xml:10
 msgid "Select mouse"
 msgstr "选择鼠标"
 
@@ -4153,42 +4384,47 @@ msgstr "选择鼠标"
 #.  NEEDS TO BE REVIEWED! 
 #.  adding some "real" text now that we know the page shows up in the right place
 #.  marja 2012-04-24 adding screenshot 
+#. 2018/02/15 apb: Text and typography.
 #. type: Content of: <section><mediaobject>
-#: en/selectMouse.xml:16
+#: en/selectMouse.xml:24
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
-"format=\"PNG\" > </imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectMouse.png\" "
+"format=\"PNG\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
-"format=\"PNG\" > </imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/selectMouse.xml:23
+#: en/selectMouse.xml:29
 msgid ""
 "If you are not happy with how your mouse responds, you can select a "
 "different one here."
 msgstr "若您对鼠标的响应速度不满意，可以在这里进行调整。"
 
 #. type: Content of: <section><para>
-#: en/selectMouse.xml:25
+#: en/selectMouse.xml:32
+#, fuzzy
 msgid ""
-"Usually, <guilabel>Universal</guilabel> - <guilabel>Any PS/2 and USB mice</"
-"guilabel> is a good choice."
+"Usually, <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Any PS/2 and "
+"USB mice</guimenuitem> </menuchoice> is a good choice."
 msgstr ""
 "一般而言，<guilabel>通用</guilabel> - <guilabel>任意 PS/2 和 USB 鼠标</"
 "guilabel>可以满足大多数需求。"
 
 #. type: Content of: <section><para>
-#: en/selectMouse.xml:27
+#: en/selectMouse.xml:38
+#, fuzzy
 msgid ""
-"Select <guilabel>Universal</guilabel> - <guilabel>Force evdev</guilabel> to "
-"configure the buttons that do not work on a mouse with six or more buttons."
+"Select <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Force edev</"
+"guimenuitem> </menuchoice> to configure the buttons that do not work on a "
+"mouse with six or more buttons."
 msgstr ""
 "选择 <guilabel>通用</guilabel> - <guilabel>强制 evdev</guilabel> 可用于配置超"
 "过五键的鼠标。"
 
-#. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:7
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloaderAddEntry.xml:7 en/setupBootloader.xml:206
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "添加或修改引导菜单项"
 
@@ -4214,106 +4450,65 @@ msgstr ""
 "Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "引导程序的主要选项"
-
-#. type: Content of: <section><section><title>
 #: en/setupBootloader.xml:10
-msgid "Bootloader interface"
+#, fuzzy
+msgid "Bootloader"
 msgstr "引导器界面"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:11
-msgid "By default, Mageia uses exclusively:"
-msgstr "默认情况下，Mageia 仅使用："
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:13
+msgid "Grub2"
+msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:14
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/setupBootloader.xml:15
 #, fuzzy
-msgid ""
-"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
-msgstr "GRUB2（包含/不包含图形界面），当使用传统硬件 + MBR/GPT格式分区时"
+msgid "Grub2 on Legacy MBR/GPT systems"
+msgstr "GRUB2，当使用传统硬件 + MBR/GPT 格式分区时"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:18
-#, fuzzy
-msgid "GRUB2-efi for a UEFI system."
-msgstr "GRUB2-efi，当使用 UEFI 硬件时。"
-
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:22
+#: en/setupBootloader.xml:17
 #, fuzzy
-msgid "The Mageia graphical menus are nice :)"
-msgstr "Mageia 的图形化菜单："
-
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:25
-#, fuzzy
-msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
-msgstr "GRUB2，当使用传统硬件 + MBR/GPT 格式分区时"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:27
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
-"setupBootloader.png\"/> </imageobject>"
-msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
-"setupBootloader.png\"/> </imageobject>"
+"GRUB2 (with or without graphical menu) will be used exclusively as the "
+"bootloader for a Legacy/MBR or Legacy/GPT system."
+msgstr "GRUB2（包含/不包含图形界面），当使用传统硬件 + MBR/GPT格式分区时"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:21
 #, fuzzy
 msgid ""
-"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
-"really know what you are doing."
-msgstr "若您不确定如何操作，请不要修改“引导设备”。"
+"By default, a new bootloader will be written into either the MBR (Master "
+"Boot Record) of your first hard drive or in the BIOS boot partition."
+msgstr "GRUB 2 引导器安装至 MBR（主引导记录）区域或第一硬盘的 BIOS 引导分区。"
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:38
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/setupBootloader.xml:27
 #, fuzzy
-msgid "GRUB2-efi on UEFI systems"
+msgid "Grub2-efi on UEFI systems"
 msgstr "GRUB2-efi，当使用 UEFI 硬件时"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:39
-#, fuzzy
-msgid ""
-"With a UEFI system, the user interface is slightly different as you cannot "
-"choose between the <emphasis role=\"bold\">with</emphasis> or <emphasis role="
-"\"bold\">without graphical menu</emphasis> options."
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:29
+msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
 msgstr ""
-"对于 UEFI，用户界面会稍有不同，您将无法选择引导器（因为只能使用 Grub2-efi）。"
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:33
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
-"imageobject>"
+"By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI "
+"System Partition)."
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
-"imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:49
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:35
 #, fuzzy
 msgid ""
-"If Mageia is the only system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to house the bootloader (GRUB2-efi). "
-"If there are already UEFI operating systems installed on your computer "
-"(Windows 8 for example), the Mageia installer detects the existing ESP "
-"created by Windows and adds GRUB2-efi. Although it is possible to have "
-"several ESPs, only one is required (and advised), whatever the number of "
-"operating systems you have."
+"If there are already UEFI-based operating systems installed on your computer "
+"(Windows 8 for example), the Mageia installer will detect the existing ESP "
+"created by Windows and add grub2-efi to it. If no ESP exists, then one will "
+"be created. Although it is possible to have several ESPs, only one is "
+"required, whatever the number of operating systems you have."
 msgstr ""
 "如果 Mageia 是您在电脑上安装的第一个系统，安装程序将自动创建一个 ESP（EFI 系"
 "统分区）来容纳引导器（Grub2-efi）。如果已安装了其他 UEFI 操作系统（例如 "
@@ -4321,273 +4516,373 @@ msgstr ""
 "grub2-efi。尽管多个 ESP 可以共存，但只需一个 ESP 即可满足启动所有操作系统的需"
 "求。"
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:61
-msgid "Using a Mageia bootloader"
-msgstr "使用 Mageia 提供的引导器"
-
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:62
-#, fuzzy
-msgid ""
-"By default, and according to your system, Mageia writes one of the following:"
-msgstr "默认情况下，根据您的硬件情况，Mageia 会将："
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:66
-#, fuzzy
-msgid ""
-"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
-"hard drive or in the BIOS boot partition."
-msgstr "GRUB 2 引导器安装至 MBR（主引导记录）区域或第一硬盘的 BIOS 引导分区。"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:70
+#. type: Content of: <section><section><info><title>
+#: en/setupBootloader.xml:46
 #, fuzzy
-msgid "a GRUB2-efi bootloader into the ESP"
-msgstr "GRUB2-efi 引导器安装至 ESP"
+msgid "Bootloader Setup"
+msgstr "引导器界面"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:73
-#, fuzzy
-msgid ""
-"If you already have other operating systems installed, Mageia attempts to "
-"add them to your new Mageia boot menu. If you don't want this behaviour, "
-"click on <guibutton>Next</guibutton> and then untick the <emphasis role="
-"\"bold\">Probe Foreign OS</emphasis> option."
-msgstr ""
-"若您已安装了其他操作系统，Mageia 会尝试将它们也添加到 Mageia 的引导菜单。如果"
-"您不希望 Mageia 这么做，请点击<guibutton>下一步</guibutton>，然后取消勾选"
-"<guilabel>检测其他操作系统</guilabel>"
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:49
+msgid "Bootloader main options"
+msgstr "引导程序的主要选项"
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:78
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:51
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
-"imageobject>"
+"\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader.png\" xml:id=\"setupBootloader-"
+"im1\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader3.png\" align=\"center\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-setupBootloader3.png\" align="
 "\"center\"/> </imageobject>"
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:87
-msgid "Using an existing bootloader"
-msgstr "使用现存的引导器"
-
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:88
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:62
 #, fuzzy
-msgid ""
-"The exact procedure for adding your Mageia system to an existing bootloader "
-"is beyond the scope of this documentation, however in most cases it will "
-"involve running the relevant bootloader installation program which should "
-"detect and add it automatically. See the documentation for the operating "
-"system in question."
-msgstr ""
-"有关添加 Mageia 系统至现存引导器的问题超出了此帮助的范围。多数情况下，这设计"
-"到运行相应的引导器安装程序，并自动检测和添加引导项。请参见有关操作系统的文档"
-"以便进一步操作。"
-
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:95
-msgid "Using chain loading"
-msgstr "使用链式加载（chain loading）"
+msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:96
-#, fuzzy
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
 msgid ""
-"If you don't want a bootable Mageia, but to chain-load it from another OS, "
-"click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
-"guibutton> and tick the box <guilabel>Do not touch ESP or MBR</guilabel>."
+"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
+"systems will not see this option here."
 msgstr ""
-"若您不需要 Mageia 安装引导器，而是希望从其他系统引导 Mageia，请点击"
-"<guibutton>下一步</guibutton>，然后点击<guibutton>高级</guibutton>并勾选 "
-"<guilabel>不要修改 ESP 或 MBR</guilabel>。"
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:101
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
-"\"center\"/> </imageobject>"
-msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
-"\"center\"/> </imageobject>"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:67
+#, fuzzy
+msgid "<emphasis role=\"bold\">Boot device</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:108
-msgid ""
-"You will get a warning that the bootloader is missing, ignore it by clicking "
-"<guibutton>OK</guibutton>."
-msgstr ""
-"安装程序将会提醒您缺少引导器，请忽略它并点击<guibutton>确定</guibutton>。"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
+#, fuzzy
+msgid "Don't change this unless you really know what you are doing"
+msgstr "只有在您完全了解您的行为的风险后再作出改动。"
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:72
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:117
-msgid "Options"
-msgstr "选项"
-
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:119
-msgid "First page"
-msgstr "第一页"
+"<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:120
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:74
 #, fuzzy
 msgid ""
-"<guilabel>Delay before booting the default image</guilabel>: This lets you "
-"set a delay in seconds before the default operating system is started up."
+"This text box lets you set a delay, in seconds, before the default operating "
+"system is started up."
 msgstr ""
 "<guilabel>自动引导之前等待</guilabel>：此文本框用于设置在等待多少秒之后自动进"
 "入默认选定的操作系统。"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:122
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:78
+#, 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
 #, fuzzy
 msgid ""
-"<guilabel>Security</guilabel>: This allows you to set a password for the "
-"bootloader. This means a username and password will be required when booting "
-"to select a booting entry or change settings. The username is <emphasis role="
-"\"bold\">root</emphasis> and the password is the one chosen here-after."
+"This allows you to set a password for the bootloader. This means a username "
+"and password will be required when booting in order to select a booting "
+"entry or change settings. This is optional, and most people are not likely "
+"to have a need for it. The username is <literal>root</literal> and the "
+"password is the one chosen hereafter."
 msgstr ""
 "<guilabel>安全</guilabel>：用于设置引导器的密码。可以防止其他人进入单用户模"
 "式，或者修改引导参数。"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:125
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
 #, fuzzy
-msgid "<guilabel>Password</guilabel>: Choose a password for the bootloader."
+msgid "Choose a password for the bootloader (optional)"
 msgstr "<guilabel>密码</guilabel>：此文本框用于输入密码"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:91
+#, 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
 #, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
-"check that it matches with the one above."
+"Retype the password and DrakX will check that it matches with the one set "
+"above"
 msgstr ""
 "<guilabel>确认密码</guilabel>：再次输入密码，安装程序将检查您两次输入的密码是"
 "否一致。"
 
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:96 en/setupBootloader.xml:154
+#, fuzzy
+msgid "<emphasis>Advanced</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
+
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
-msgid "<guilabel>Advanced</guilabel>"
-msgstr "<guilabel>高级</guilabel>"
+#: en/setupBootloader.xml:99
+#, fuzzy
+msgid "<emphasis>Enable ACPI</emphasis>"
+msgstr "<emphasis>通用</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:127
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:100
 #, fuzzy
 msgid ""
-"<guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power "
-"Interface) is a standard for power management. It can save energy by "
-"stopping unused devices.  Deselecting it could be useful if, for example, "
-"your computer does not support ACPI or if you think the ACPI implementation "
-"might cause some problems (for instance random reboots or system lockups)."
+"ACPI (Advanced Configuration and Power Interface) is a standard for power "
+"management. It can save energy by stopping unused devices. Deselecting it "
+"could be useful if, for example, your computer does not support ACPI or if "
+"you think the ACPI implementation might cause some problems (for instance "
+"random reboots or system lockups)."
 msgstr ""
 "ACPI（高级配置与电源接口）是标准的电源管理协议。它可以关闭未使用的设备以节"
 "能，用于取代 APM。如果您的硬件不兼容 ACPI，或者您认为 ACPI 会造成某些问题（如"
 "偶尔会自动重启，或系统卡死），则可以取消勾选它。"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:133
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:108
+#, fuzzy
+msgid "<emphasis>Enable SMP</emphasis>"
+msgstr "<emphasis>通用</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:109
 #, fuzzy
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
-"multiprocessing for multi core processors."
+"This option enables/disables symmetric multiprocessing for multi-core "
+"processors"
 msgstr ""
 "<guilabel>启用 SMP</guilabel>：此选项启用或禁用多核处理器上的对称多处理器特"
 "性。"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:135
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:113
+#, fuzzy
+msgid "<emphasis>Enable APIC</emphasis>"
+msgstr "<emphasis>通用</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:114
 #, fuzzy
 msgid ""
-"<guilabel>Enable APIC</guilabel>: This gives the operating system access to "
-"the Advanced Programmable Interrupt Controller. APIC devices permit more "
-"complex priority models, and Advanced IRQ (Interrupt Request) management."
+"Enabling this gives the operating system access to the Advanced Programmable "
+"Interrupt Controller. APIC devices permit more complex priority models, and "
+"Advanced IRQ (Interrupt Request)  management."
 msgstr ""
 "<guilabel>启用 APIC</guilabel>：启用或禁用高级可编程中断控制器。APIC 设备可以"
 "支持更复杂的优先级模型和高级 IRQ（中断请求）管理功能。"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:138
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:120
+#, fuzzy
+msgid "<emphasis>Enable Local APIC</emphasis>"
+msgstr "<emphasis>通用</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:121
 #, fuzzy
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
-"interrupts for a specific processor in an SMP system."
+"Here you can set Local APIC, which manages all external interrupts for a "
+"specific processor in an SMP system"
 msgstr ""
 "<guilabel>启用本地 APIC</guilabel>：您可以在这里设置本地 APIC，用于在 SMP 系"
 "统中管理某个特定处理器的所有外部中断。"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:143
-msgid "Next page"
-msgstr "下一页"
+#: en/setupBootloader.xml:127
+#, fuzzy
+msgid "Bootloader Configuration"
+msgstr "声音配置"
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:129
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-setupBootloader3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader3.png\" align="
+"\"center\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:139
+#, fuzzy
+msgid "<emphasis role=\"bold\">Default</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:146
-msgid "<guilabel>Default:</guilabel> Operating system started up by default"
+#: en/setupBootloader.xml:140
+#, fuzzy
+msgid "The operating system to started up by default"
 msgstr "<guilabel>默认</guilabel>：使用默认引导参数"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:150
+#: en/setupBootloader.xml:143
+#, 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
+#, fuzzy
 msgid ""
-"<guilabel>Append:</guilabel> This option lets you pass the kernel "
-"information or tell the kernel to give you more information as it boots."
+"This option lets you pass information to the kernel or tell the kernel to "
+"give you more information as it boots"
 msgstr ""
 "<guilabel>追加</guilabel> ：用于在默认引导选项后添加额外所需的内核参数。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:155
+#: en/setupBootloader.xml:148
+#, 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
+#, fuzzy
 msgid ""
-"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
-"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
+"If you already have other operating systems installed, Mageia attempts to "
+"add them to your new Mageia boot menu. If you don't want this behaviour, "
+"then untick the Probe Foreign OS option."
+msgstr ""
+"若您已安装了其他操作系统，Mageia 会尝试将它们也添加到 Mageia 的引导菜单。如果"
+"您不希望 Mageia 这么做，请点击<guibutton>下一步</guibutton>，然后取消勾选"
+"<guilabel>检测其他操作系统</guilabel>"
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:156
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-setupBootloader4.png\"/> </"
+"imageobject>"
 msgstr ""
-"<guilabel>探测其他系统</guilabel>：参见<link linkend=\"setupMageiaBootloader"
-"\">使用 Mageia 引导器</link>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader3.png\" align="
+"\"center\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:166
+#, fuzzy
+msgid "<emphasis>Video mode</emphasis>"
+msgstr "<emphasis>供应商</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:167
 #, fuzzy
 msgid ""
-"<guilabel>Video mode:</guilabel> This sets the screen size and colour depth "
-"to be used by the boot menu. If you click the down triangle you will be "
-"offered other size and colour depth options."
+"This sets the screen size and colour depth to be used by the boot menu. If "
+"you click the down-triangle you will be offered other size and colour depth "
+"options."
 msgstr ""
 "<guilabel>图像模式</guilabel>：用于设定显示引导菜单时的屏幕分辨率和色彩深度。"
 "若要从可用的模式中进行选择，请点击下三角标记。"
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:162
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:172
+#, 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
+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 "
+"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
+"implications, and wish to proceed."
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:181
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:188
+#, fuzzy
+msgid "Other Options"
+msgstr "选项"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:190
+msgid "Using an existing bootloader"
+msgstr "使用现存的引导器"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:191
+#, fuzzy
 msgid ""
-"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
-"linkend=\"setupChainLoading\">Using the chain loading</link>"
+"The exact procedure for adding Mageia to an existing bootloader is beyond "
+"the scope of this documentation. However in most cases it will involve "
+"running the relevant bootloader installation program, which should detect "
+"Mageia and automatically add an entry for it in the bootloader menu. See the "
+"documentation for the relevant operating system."
 msgstr ""
-"<emphasis role=\"bold\">不要修改 ESP 或 MBR</emphasis>：参见<link linkend="
-"\"setupChainLoading\">使用链式加载</link>"
+"有关添加 Mageia 系统至现存引导器的问题超出了此帮助的范围。多数情况下，这设计"
+"到运行相应的引导器安装程序，并自动检测和添加引导项。请参见有关操作系统的文档"
+"以便进一步操作。"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:199
+#, fuzzy
+msgid "Installing Without a Bootloader"
+msgstr "使用 Mageia 提供的引导器"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:200
+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 "
+"doing, as without some form of bootloader your operating system will be "
+"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:3
+#: en/setupSCSI.xml:10
 msgid "Setup SCSI"
 msgstr "设置SCSI"
 
@@ -4599,18 +4894,20 @@ msgstr "设置SCSI"
 #.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
 #.        Mdv doc instead of on our setupSCSI file 
+#. 2018/02/15 apb: Text and typography.
+#. 2018/0217 apb: Merge 2nd/3rd paras and reword.
 #. type: Content of: <section><mediaobject>
-#: en/setupSCSI.xml:22
+#: en/setupSCSI.xml:33
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" align="
-"\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-setupSCSI.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"setupSCSI-im1\"/> </imageobject>"
 msgstr ""
-"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
-"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:27
+#: en/setupSCSI.xml:39
 #, fuzzy
 msgid ""
 "DrakX will normally detect hard disks correctly. However, with some older "
@@ -4621,96 +4918,58 @@ msgstr ""
 "的驱动，并因此无法识别它们。"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:44
 #, fuzzy
 msgid ""
-"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
-"you have."
+"If your device is not recognised, you will need to manually tell DrakX which "
+"SCSI drive(s) you have. DrakX should then be able to configure the drive(s) "
+"correctly."
 msgstr "在这种情况下，您需要手动设置 DrakX 应当使用的 SCSI 驱动。"
 
-#. type: Content of: <section><para>
-#: en/setupSCSI.xml:35
-msgid "DrakX should then be able to configure the drive(s) correctly."
-msgstr "随后 DrakX 应当能正确配置这些驱动器。"
-
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:3
+#: en/soundConfig.xml:10
 msgid "Sound Configuration"
 msgstr "声音配置"
 
 #.  Lebarhon 20170209 updated SC
+#. 2018/02/13 apb: Text and typography.
+#. 2018/02/17 apb: Centre-align PNG
 #. type: Content of: <section><mediaobject>
-#: en/soundConfig.xml:9
-msgid ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
-"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
-"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
-
-#. type: Content of: <section><para>
-#: en/soundConfig.xml:14
+#: en/soundConfig.xml:20
 #, fuzzy
 msgid ""
-"In this screen the name of the driver that the installer chose for your "
-"sound card is given, which will be the default driver if one exists."
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-soundConfig.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"soundConfig-im1\"/> </imageobject>"
 msgstr ""
-"这一界面中列出了安装程序为声卡选定的驱动，如果有默认驱动则将其作为默认配置。"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:18
+#: en/soundConfig.xml:26
 msgid ""
-"The default driver should work without problems. However, if after install "
-"you do encounter problems, then run <command>draksound</command> or start "
-"this tool via MCC (Mageia Control Center), by choosing the "
-"<guilabel>Hardware</guilabel> tab and clicking on <guilabel>Sound "
-"Configuration</guilabel> at the top right of the screen."
+"This screen shows the details of the sound card driver chosen for you by the "
+"installer, and this driver should work without problems."
 msgstr ""
-"默认驱动通常不会出问题。不过，如果您在安装后遇到问题，请运行 "
-"<command>draksound</command>，或通过 MCC（Mageia 控制中心）中<guilabel>硬件</"
-"guilabel>选项卡中的<guilabel>声音配置</guilabel>来启动 draksound。"
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:24
-#, fuzzy
+#: en/soundConfig.xml:29
 msgid ""
-"Then, in the <emphasis role=\"bold\">draksound</emphasis> or <emphasis role="
-"\"bold\">Sound Configuration</emphasis> tool screen, click on "
-"<guibutton>Troubleshooting</guibutton> to find useful advice about how to "
-"solve the problem."
+"However, if you encounter any issues post-install, then run "
+"<command>draksound</command> or start this tool via <menuchoice> "
+"<guimenu>Mageia Control Center</guimenu> <guimenuitem>Hardware</guimenuitem> "
+"<guimenuitem>Sound Configuration</guimenuitem> </menuchoice>. Then, in the "
+"<literal>draksound</literal> or <emphasis>Sound Configuration</emphasis> "
+"screen, click on <emphasis>Troubleshooting</emphasis> to find useful advice "
+"about how to solve the problem."
 msgstr ""
-"在 draksound 或“声音配置”工具界面，点击<guibutton>高级</guibutton>、"
-"<guibutton>故障排除</guibutton>来查看解决问题的建议。"
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:30
+#: en/soundConfig.xml:43
 msgid "Advanced"
 msgstr "高级"
 
-#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:33
-#, fuzzy
-msgid ""
-"Clicking <emphasis role=\"bold\"><guibutton>Advanced</guibutton></emphasis> "
-"in this screen, during install, is useful if there is no default driver and "
-"there are several drivers available, but you think the installer selected "
-"the wrong one."
-msgstr ""
-"若没有默认驱动，或者默认驱动选择错误，则可以安装时点击此界面中的"
-"<guibutton>Advanced</guibutton>来更正。"
-
-#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:38
-#, fuzzy
-msgid ""
-"In that case you can select a different driver after clicking on <emphasis "
-"role=\"bold\"><guibutton>Let me pick any driver</guibutton></emphasis>."
-msgstr ""
-"`在这种情况下，您可以在点击<guibutton>让我选择任意驱动</guibutton>来选择其他"
-"驱动程序。"
-
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:3
+#: en/takeOverHdConfirm.xml:10
 msgid "Confirm hard disk to be formatted"
 msgstr "确定要格式化的硬盘"
 
@@ -4720,129 +4979,149 @@ msgstr "确定要格式化的硬盘"
 #.     hard disk." with "if you are not sure about your choice", because I'm sure I
 #.     saw this help screen when I had only one HD 
 #.  2013-05-05 marja added screenshot 
+#. 2018/02/15 apb: Text and typography
+#. 2018/02/20 apb: Change the 2 paras to itemized listitems.
 #. type: Content of: <section><mediaobject>
-#: en/takeOverHdConfirm.xml:18
+#: en/takeOverHdConfirm.xml:29
 #, fuzzy
 msgid ""
-"<imageobject condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-"
-"takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
-"takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-takeOverHdConfirm.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata align=\"center\" fileref=\"live-"
+"takeOverHdConfirm.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
-"<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
-"png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-"
-"takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:27
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/takeOverHdConfirm.xml:42
 #, fuzzy
 msgid ""
-"Click on <guibutton>Previous</guibutton> if you are at all unsure about your "
+"Click on <emphasis>Previous</emphasis> if you are at all unsure about your "
 "choice."
 msgstr "若您不确定选择是否正确，请点击 <guibutton>上一步</guibutton>。"
 
-#. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:31
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/takeOverHdConfirm.xml:48
 #, fuzzy
 msgid ""
-"Click on <guibutton>Next</guibutton> to proceed if you are sure that it is "
-"ok to erase every partition, every operating system and all data that might "
-"be on that hard disk."
+"Click on <emphasis>Next</emphasis> to proceed if you are sure that it is OK "
+"to erase <emphasis role=\"bold\">every</emphasis> partition, <emphasis role="
+"\"bold\">every</emphasis> operating system and <emphasis role=\"bold\">all "
+"data</emphasis> that might be on that hard disk."
 msgstr ""
 "如果您确定要删除所有分区和所有操作系统（及数据），请点击 <guibutton>下一步</"
 "guibutton>。"
 
 #. type: Content of: <section><info><title>
-#: en/testing.xml:9
+#: en/testing.xml:3
 msgid "Testing Mageia as Live system"
 msgstr "以 Live 模式运行 Mageia"
 
 #. type: Content of: <section><section><info><title>
-#: en/testing.xml:14
+#: en/testing.xml:8
 msgid "Live mode"
 msgstr "Live 模式"
 
+#. type: Content of: <section><section><para>
+#: en/testing.xml:11
+msgid ""
+"This is the screen you will see if you selected the <emphasis role=\"bold"
+"\">Boot Mageia </emphasis>option from the Live media menu."
+msgstr ""
+
 #. type: Content of: <section><section><mediaobject>
-#: en/testing.xml:18
+#: en/testing.xml:14
 msgid "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/testing.xml:23
-msgid ""
-"You get this screen if you selected \"Boot Mageia\". If not, you get the "
-"\"<link linkend=\"doPartitionDisks\">Partitioning</link> step\""
-msgstr ""
-"如果选择了“引导Mageia”，您将看到此界面。如果没有，你将看到“<link linkend="
-"\"doPartitionDisks\">分区</link>”界面。"
-
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:28
+#: en/testing.xml:21
 msgid "Testing hardware"
 msgstr "测试硬件"
 
 #. type: Content of: <section><section><section><para>
-#: en/testing.xml:31
+#: en/testing.xml:24
+#, fuzzy
 msgid ""
-"One of the Live mode goals is to test if the hardware is correctly managed "
-"by Mageia. You can check if all devices have a driver in the Hardware "
-"section of the Mageia Control Center. You can test the most current devices:"
+"One of the aims of using the Live mode is to test that your hardware is "
+"correctly managed by Mageia. You can check if all devices have a driver in "
+"the Hardware section of the Mageia Control Center:"
 msgstr ""
 "Live 模式的目的在于测试硬件是否被 Mageia 正确管理。您可以在 Mageia 控制中心中"
 "检查所有设备是否均有对应驱动程序。您可以测试最新的设备："
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:38
+#: en/testing.xml:31
 msgid "network interface: configure it with net_applet"
 msgstr "网络接口：使用 net_applet 进行配置"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:42
-msgid "graphical card: if you see the previous screen, it's already OK."
+#: en/testing.xml:35
+#, fuzzy
+msgid "graphics card: if you see the previous screen, it's already OK."
 msgstr "显卡：若您能看见刚才的界面，说明配置正常。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:47
+#: en/testing.xml:40
 msgid "webcam:"
 msgstr "摄像头："
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:51
+#: en/testing.xml:44
 msgid "sound: a jingle has already been played"
 msgstr "声音：刚才播放了“叮呤”声"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:55
-msgid "printer: configure it and print a test page"
+#: en/testing.xml:48
+#, fuzzy
+msgid "printer: configure your printer/s and print a test page"
 msgstr "打印机：配置打印机，并打印测试页"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:59
+#: en/testing.xml:52
 msgid "scanner: scan a document from ..."
 msgstr "扫描器：扫描文档自 ..."
 
 #. type: Content of: <section><section><section><para>
-#: en/testing.xml:63
+#: en/testing.xml:56
+#, fuzzy
 msgid ""
-"If all is OK for you, you can process to the installation. If not, you can "
-"leave with the quit button."
+"If everything is satisfactory, you can proceed with the installation. If "
+"not, you can use the <emphasis>Quit</emphasis> button to exit."
 msgstr "如果一切就绪，安装现在即可开始；反之，您可以点击退出按钮。"
 
-#. type: Content of: <section><section><section><remark>
-#: en/testing.xml:66
-msgid "The configuration settings you made here are kept for the installation."
+#. type: Content of: <section><section><section><note><para>
+#: en/testing.xml:61
+#, fuzzy
+msgid ""
+"The configuration settings you apply here are carried over if you decide to "
+"proceed with the installation."
 msgstr "此处您的配置将保留并用于安装过程。"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:72
+#: en/testing.xml:68
 msgid "Launch installation"
 msgstr "启动安装"
 
+#. type: Content of: <section><section><section><para>
+#: en/testing.xml:71
+#, fuzzy
+msgid ""
+"To launch the installation of the Live DVD to a hard disk or SSD drive, "
+"simply click the <emphasis>Install on Hard Disk</emphasis> icon on the Live "
+"desktop. You will then see this screen, followed by the <link linkend="
+"\"doPartitionDisks\">Partitioning</link> step."
+msgstr ""
+"要使用 Mageia LiveCD 或 LiveDVD 来安装系统至硬盘/SSD，只需点击“安装至硬盘”图"
+"标。随后您将会看见此界面，然后点击“<link linkend=\"doPartitionDisks\">分区</"
+"link>”并直接进入安装过程。"
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/testing.xml:76
+#: en/testing.xml:77
 msgid ""
 "<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
 "imageobject>"
@@ -4850,25 +5129,13 @@ msgstr ""
 "<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/testing.xml:81
-msgid ""
-"To launch the installation of Mageia LiveCD or Live DVD to the hard disc or "
-"SSD drive, simply click on the icon \"Install on Hard Disk\". You will get "
-"this screen, and then the \"<link linkend=\"doPartitionDisks\">Partitioning</"
-"link> step\" as for the direct installation."
-msgstr ""
-"要使用 Mageia LiveCD 或 LiveDVD 来安装系统至硬盘/SSD，只需点击“安装至硬盘”图"
-"标。随后您将会看见此界面，然后点击“<link linkend=\"doPartitionDisks\">分区</"
-"link>”并直接进入安装过程。"
-
 #. type: Content of: <section><info><title>
-#: en/uninstall-Mageia.xml:3
+#: en/uninstall-Mageia.xml:10
 msgid "Uninstalling Mageia"
 msgstr "卸载Mageia"
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:18
 #, fuzzy
 msgid ""
 "If Mageia didn't convince you or you can't install it correctly - in short "
@@ -4879,28 +5146,31 @@ msgstr ""
 "一功能可不是所有操作系统都会提供的！"
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:14
+#: en/uninstall-Mageia.xml:23
 #, fuzzy
 msgid ""
-"After your data backup, reboot your Mageia installation DVD and select "
-"<emphasis role=\"bold\">Rescue system</emphasis>, then, <emphasis role=\"bold"
-"\">Restore Windows boot loader</emphasis>. At the next boot, you will only "
-"have Windows, with no option to choose your operating system."
+"After backing up your data, reboot your Mageia installation DVD and select "
+"<emphasis>Rescue system</emphasis>, then <emphasis>Restore Windows boot "
+"loader</emphasis>. At the next boot, you will only have Windows, with no "
+"option to choose your Mageia operating system."
 msgstr ""
 "在备份您的数据后，请用 Mageia 安装 DVD 重新引导系统，并进入救援系统，选择恢"
 "复 Windows 引导器（Restore Windows boot loader）。再次重启后，您将只能进入 "
 "Windows 系统。"
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:19
+#: en/uninstall-Mageia.xml:28
 #, fuzzy
 msgid ""
-"In Windows to recover the space used by Mageia partitions: click on "
-"<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
-"> Storage -> Disk Management</code>. You will recognize a Mageia partition "
-"because they are labeled <guilabel>Unknown</guilabel>, and also by their "
-"size and place on the disk. Right click on each of these partitions and "
-"select <guibutton>Delete</guibutton> to free up the space."
+"In Windows, to recover the space used by Mageia partitions: click on "
+"<menuchoice> <guimenu>Start</guimenu> <guimenuitem>Control Panel</"
+"guimenuitem> <guimenuitem>Administrative Tools</guimenuitem> "
+"<guimenuitem>Computer Management</guimenuitem> <guimenuitem>Storage</"
+"guimenuitem> <guimenuitem>Disk Management</guimenuitem> </menuchoice>. You "
+"will recognise a Mageia partition because they are labeled <literal>Unknown</"
+"literal>, and also by their size and place on the disk. Right-click on each "
+"of these partitions and select <emphasis>Delete</emphasis> to free up the "
+"space."
 msgstr ""
 "若要将被 Mageia 使用的空间重新用于 Windows，请点击 <code>开始 -> 控制面包 -> "
 "管理工具 -> 计算机管理 -> 存储 -> 磁盘管理</code>。拥有 <guilabel>未知</"
@@ -4909,16 +5179,17 @@ msgstr ""
 "空间。"
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:27
+#: en/uninstall-Mageia.xml:46
+#, fuzzy
 msgid ""
 "If you are using Windows XP, you can create a new partition and format it "
-"(FAT32 or NTFS). It will get a partition letter."
+"(FAT32 or NTFS). It will then get a partition letter."
 msgstr ""
 "若您安装了 Windows XP，您可以使用空闲空间创建一个新分区并格式化它（FAT32 或 "
 "NTFS），系统将自动为其分配一个盘符。"
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:30
+#: en/uninstall-Mageia.xml:49
 #, fuzzy
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
@@ -4932,32 +5203,48 @@ msgstr ""
 "整分区时，请多加小心，并确保所有重要的数据均以备份。"
 
 #. type: Content of: <section><info><title>
-#: en/unused.xml:9
+#: en/unused.xml:3
 msgid "Keep or delete unused material"
 msgstr "保留或删除未使用的软件"
 
+#. 2018/03/03 apb: Adjusted text and updated SC's to Mga6.
 #. type: Content of: <section><mediaobject>
-#: en/unused.xml:13
+#: en/unused.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"unused-im1\" fileref=\"live-"
+"unused.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/unused.xml:19
+#: en/unused.xml:14
+#, fuzzy
 msgid ""
 "In this step, the installer looks for unused locales packages and unused "
-"hardware packages. Then it proposes you to delete them. It is a good idea to "
-"accept, except if you prepare an installation which has to run on different "
-"hardware."
+"hardware packages and you are then given an opportunity to delete them."
 msgstr ""
 "在这一步中，安装程序将会查找未使用的语言包和硬件包，并将其删除。除非您需要在"
 "不同的硬件上运行系统，否则最好允许此操作。"
 
+#. type: Content of: <section><para>
+#: en/unused.xml:18
+msgid ""
+"If you do not foresee a case where your installation may need to run on "
+"different hardware, or that you might need additional localization files "
+"then you might wish to accept this proposal."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/unused.xml:22
+msgid ""
+"Clicking <emphasis>Advanced</emphasis> will list the unused hardware and "
+"localization files that will be removed if you proceed."
+msgstr ""
+
 #. type: Content of: <section><mediaobject>
-#: en/unused.xml:25
+#: en/unused.xml:26
 msgid ""
 "<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
 "> </imageobject>"
@@ -4966,14 +5253,767 @@ msgstr ""
 "> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/unused.xml:30
+#: en/unused.xml:31
+#, fuzzy
 msgid ""
-"The next step is the copying of files on hard disk. This takes some minutes. "
-"At the end, you get a blank screen for some time, it's normal."
+"The next step is the copying of files to hard disk. This process should just "
+"take a little while to complete. When it is finising you will briefly get a "
+"blank screen - this is normal."
 msgstr ""
 "下一步是复制文件到硬盘。这需要花费几分钟的时间。之后，您的屏幕会变黑一段时"
 "间，这是正常现象。"
 
+#~ msgid "User and Superuser Management"
+#~ msgstr "用户和管理员管理"
+
+#, fuzzy
+#~ msgid ""
+#~ "Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+#~ "(capacity, mount point, type).</emphasis>"
+#~ msgstr ""
+#~ "所有分区的属性将按下列顺序显示：“设备名”（“容量”，“挂载点”，“类型”）。"
+
+#~ msgid "In advanced tab, you will find more options about clock settings."
+#~ msgstr "在高级选项卡中，你可以找到更多有关时钟设置的选项。"
+
+#~ msgid "From a disc"
+#~ msgstr "自磁盘"
+
+#~ msgid ""
+#~ "You can boot directly from the media you used to burn your image (CD-ROM, "
+#~ "DVD-ROM...). You usually just need to insert it in your CD/DVD drive for "
+#~ "the bootloader to launch the installation automatically after rebooting "
+#~ "the computer. If that does not happen you may need to reconfigure your "
+#~ "BIOS or press one key that will offer you to choose the peripheral from "
+#~ "which the computer will boot."
+#~ msgstr ""
+#~ "可以使用刻录的镜像（CD-ROM，DVD-ROM等）直接引导 Mageia。只需将媒体插入到光"
+#~ "盘驱动器中，然后重启电脑即可。若没有出现引导画面，则需要手动修改 BIOS 配"
+#~ "置，或者在电脑启动时按下特定按键来选择引导设备。"
+
+#~ msgid ""
+#~ "According to which hardware you have, and how it is configured, you get "
+#~ "either one or another of the two screens below."
+#~ msgstr "根据你所使用的硬件以及配置的不同，接下来还有一些安装选项需要设置。"
+
+#~ msgid "From a USB device"
+#~ msgstr "自 USB 设备"
+
+#~ msgid ""
+#~ "You can boot from the USB device on which you dumped your image ISO. "
+#~ "According to your BIOS settings, the computer boots perhaps directly on "
+#~ "the USB device already plugged in a port. If that does not happen you may "
+#~ "need to reconfigure your BIOS or press one key that will offer you to "
+#~ "choose the peripheral from which the computer will boot."
+#~ msgstr ""
+#~ "你可以通过写有镜像 ISO 的 USB 设备来引导 Mageia。根据 BIOS 设置不同，电脑"
+#~ "可能直接从插入的 USB 设备上启动，也可能跳过 USB 设备。在后一种情况下，你需"
+#~ "要手动修改 BIOS 配置，或在电脑启动时按下特定按键来选择引导设备。"
+
+#~ msgid ""
+#~ "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
+#~ msgstr ""
+#~ "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
+
+#~ msgid "In the middle menu, you have the choice between three actions:"
+#~ msgstr "中间的菜单提供了三个可选操作："
+
+#~ msgid ""
+#~ "Boot from hard disk: This choice allows to boot from hard disk, as usual, "
+#~ "when no media (CD/DVD or USB stick) is connected. (not working with "
+#~ "Mageia 5)."
+#~ msgstr ""
+#~ "Boot from hard disk：从硬盘引导，和不使用引导媒体的情况相同（即不启动 "
+#~ "Mageia 5）。"
+
+#~ msgid "In the bottom menu, are the Boot Options:"
+#~ msgstr "底部菜单中提供了引导选项："
+
+#~ msgid ""
+#~ "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
+#~ msgstr "F1 - 帮助。说明”splash“、”apm“、”acpi“、”ide“等选项。"
+
+#~ msgid "F2 - Language. Choose the display language of the screens."
+#~ msgstr "F2 - 语言。选择用于显示的语言。"
+
+#~ msgid ""
+#~ "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
+#~ msgstr "F3 -屏幕分辨率。选择 640x400、800x600、1024x728 或纯文本模式。"
+
+#~ msgid ""
+#~ "F5 - Driver. Yes or No. The system is aware about the presence of an "
+#~ "optional disk with a driver update and will require its insertion during "
+#~ "installation process."
+#~ msgstr ""
+#~ "F5 - 驱动。是否使用驱动。系统将在安装过程中提醒需要使用驱动更新的磁盘，并"
+#~ "将其插入。"
+
+#~ msgid ""
+#~ "F6 - Kernel options. This is a way to specify options according to your "
+#~ "hardware and the drivers to use."
+#~ msgstr "F6 - 内核选项。用于指定与硬件和驱动相关的内核参数。"
+
+#~ msgid "First screen while booting on UEFI system from disk"
+#~ msgstr "在 UEFI 模式下引导时的第一个画面"
+
+#~ msgid ""
+#~ "You have only the choice to run Mageia in Live mode (first choice)  or to "
+#~ "process the installation (second choice)."
+#~ msgstr ""
+#~ "你可以选择以 Live 模式运行 Mageia（第一个选项）或者直接进行安装（第二个选"
+#~ "项）。"
+
+#~ msgid ""
+#~ "In each case, the first steps will be the same to choose language, "
+#~ "timezone and keyboard, then the processes differ, with <link linkend="
+#~ "\"testing\">additional steps in Live mode</link>."
+#~ msgstr ""
+#~ "在不同选项中，都需要先选择语言、时区和键盘布局，然后 <link linkend="
+#~ "\"testing\">Live 模式下会有额外的步骤</link>。"
+
+#, fuzzy
+#~ msgid ""
+#~ "Depending on your selection here, you may be offered further screens to "
+#~ "fine-tune your choice."
+#~ msgstr "根据所选项不同，随后会出现不同的窗口用于详细设置。"
+
+#, fuzzy
+#~ msgid "The settings DrakX chose are usually good."
+#~ msgstr "DrakX自动选择的设置通常可正常工作。"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_card_list-"
+#~ "im1\" align=\"center\" fileref=\"dx2-configureX_card_list.png\" revision="
+#~ "\"1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" "
+#~ "align=\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "The <emphasis role=\"bold\">Nonfree</emphasis> repository needs to be "
+#~ "explicitly enabled to access them. If you didn't enable it previously, "
+#~ "you should do this after your first reboot."
+#~ msgstr ""
+#~ "需要手动启用 Nonfree 仓库才能使用其中的程序。若您在此之前未选中 Nonfree 仓"
+#~ "库，您应当在安装完成并重启后启用它。"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
+#~ "fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref="
+#~ "\"live-reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your "
+#~ "card from the list if needed."
+#~ msgstr ""
+#~ "<emphasis><guibutton>显卡</guibutton></emphasis>：请从列表中选择您的显卡设"
+#~ "备。"
+
+#~ msgid "Incorrect refresh rates may damage your monitor"
+#~ msgstr "不正确的刷新率可能会损坏显示器"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
+#~ "fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref="
+#~ "\"live-reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
+
+#~ msgid "<emphasis>Custom</emphasis>"
+#~ msgstr "<emphasis>自定义</emphasis>"
+
+#~ msgid "<emphasis>Plug 'n Play</emphasis>"
+#~ msgstr "<emphasis>即插即用</emphasis>"
+
+#~ msgid "the monitor manufacturers name"
+#~ msgstr "显示器制造商名称"
+
+#~ msgid "the monitor description"
+#~ msgstr "显示器描述"
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake."
+#~ "png\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake."
+#~ "png\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Click <guibutton>Done</guibutton> when you're ready."
+#~ msgstr " 准备好时点击<guibutton>完成</guibutton>按钮。"
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "Use Free Space"
+#~ msgstr "使用空闲空间"
+
+#~ msgid "Use Free Space on a Windows Partition"
+#~ msgstr "使用 Windows 分区中的空闲空间"
+
+#~ msgid ""
+#~ "If you have unused space on an existing Windows partition, the installer "
+#~ "may offer to use it."
+#~ msgstr "若现存 Windows 分区中有空闲空间，安装程序将把 Mageia 安装在此处。"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "Erase and use Entire Disk."
+#~ msgstr "擦除磁盘，并使用整个磁盘。"
+
+#~ msgid ""
+#~ "Note! This will erase ALL data on the selected hard drive. Take care!"
+#~ msgstr "注意！将会删除所选驱动器上的所有数据！请谨慎操作！"
+
+#, fuzzy
+#~ msgid "Custom disk partitioning"
+#~ msgstr "使用 DiskDrake 自定义磁盘分区方式"
+
+#, fuzzy
+#~ msgid ""
+#~ "That means that from 160 GB or greater available space, the installer "
+#~ "will create three partitions: 50 GB for <emphasis role=\"bold\">/</"
+#~ "emphasis>, 4 GB for <emphasis role=\"bold\">swap</emphasis> and the "
+#~ "remainder for <emphasis role=\"bold\">/home</emphasis>."
+#~ msgstr ""
+#~ "这意味着如果您有 160GB 可用空间，将会创建 50GB 的 / 分区，4GB 的交换分区，"
+#~ "以及 106GB 的 /home 分区。"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+#~ "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition="
+#~ "\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "January 2015"
+#~ msgstr "2015 年一月"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid "Using a Mageia DVD"
+#~ msgstr "使用 Mageia 提供的引导器"
+
+#, fuzzy
+#~ msgid ""
+#~ "Here are the default welcome screens when using a Mageia DVD, The first "
+#~ "one is what you will see if you have a UEFI system, the second one is for "
+#~ "a Legacy system:"
+#~ msgstr ""
+#~ "此处是使用 Mageia DVD 安装的默认欢迎屏幕：第一个是使用传统引导的系统，第二"
+#~ "个是使用 UEFI 引导的系统。"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/"
+#~ "> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "Use the arrow keys to select the language then press <emphasis role=\"bold"
+#~ "\">Enter</emphasis>."
+#~ msgstr "使用方向键来选择语言，然后按 Enter 键。"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/"
+#~ "> </imageobject>"
+
+#, fuzzy
+#~ msgid "Default: It doesn't alter anything in the default options."
+#~ msgstr "- 默认，即使用默认选项。"
+
+#, fuzzy
+#~ msgid ""
+#~ "Safe Settings: Priority is given to the safer options at the price of a "
+#~ "performance detriment."
+#~ msgstr "- 安全设置，使用更安全的选项（同时会在一定程度上降低性能）"
+
+#~ msgid ""
+#~ "When you select one of these entries, it modifies the default options "
+#~ "displayed in the <guilabel>Boot Options</guilabel> line."
+#~ msgstr ""
+#~ "若选择了这些选项之一，将会同时更改<guilabel>引导选项</guilabel>行中的默认"
+#~ "选项。"
+
+#, fuzzy
+#~ msgid ""
+#~ "In some Mageia releases, it may happen that the entries selected with "
+#~ "<emphasis role=\"bold\">F6</emphasis> do not appear in the <guilabel>Boot "
+#~ "Options</guilabel> line, despite this, they will in fact be applied."
+#~ msgstr ""
+#~ "在部分 Mageia 版本中，使用 F6 键选择的选项可能不会在<guilabel>引导选项</"
+#~ "guilabel>中出现，但这并不影响选项发挥作用。"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/"
+#~ "> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "Pressing <emphasis role=\"bold\">F1</emphasis> opens a help window for "
+#~ "various boot options. Select an item with the arrow keys and press "
+#~ "<emphasis role=\"bold\">Enter</emphasis> for more details or press "
+#~ "<emphasis role=\"bold\">Esc</emphasis> to go back to the welcome screen."
+#~ msgstr ""
+#~ "按 F1 可以打开包含更多选项的新窗口。使用方向键和 Enter 来查看更多细节，或"
+#~ "按 Esc 来返回到欢迎屏幕。"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/"
+#~ "> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "The detailed view about the splash option. Press <emphasis role=\"bold"
+#~ "\">Esc</emphasis> or select <guilabel>Return to Boot Options</guilabel> "
+#~ "to go back to the options list. These options can be added by hand in the "
+#~ "<guilabel>Boot Options</guilabel> line."
+#~ msgstr ""
+#~ "有关 splash 选项的细节。按 Esc 或选择 <guilabel>返回引导选项</guilabel>可"
+#~ "以回到选项列表。可以手动将这些选项添加到<guilabel>引导选项</guilabel> 行。"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/"
+#~ "> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "The help is translated in the chosen language with <emphasis role=\"bold"
+#~ "\">F2</emphasis>."
+#~ msgstr "按 F2 键可以将帮助翻译为所选语言。"
+
+#~ msgid ""
+#~ "For more information about kernel options on legacy and UEFI systems, "
+#~ "see: <link ns2:href=\"https://wiki.mageia.org/en/"
+#~ "How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
+#~ "How_to_set_up_kernel_options</link>"
+#~ msgstr ""
+#~ "有关传统引导和 UEFI 引导的内核选项，请参考：<link ns2:href=\"https://wiki."
+#~ "mageia.org/en/How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
+#~ "How_to_set_up_kernel_options</link>。"
+
+#~ msgid "Media Selection (Nonfree)"
+#~ msgstr "介质选择 (Nonfree)"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" "
+#~ "align=\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" "
+#~ "align=\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Summary of miscellaneous parameters"
+#~ msgstr "一些杂项"
+
+#~ msgid "<guilabel>Timezone</guilabel>"
+#~ msgstr "<guilabel>时区</guilabel>"
+
+#~ msgid "<guilabel>Country / Region</guilabel>"
+#~ msgstr "<guilabel>国家/地区</guilabel>"
+
+#~ msgid "<guilabel>Bootloader</guilabel>"
+#~ msgstr "<guilabel>引导器</guilabel>"
+
+#~ msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
+#~ msgstr "更多信息，参见 <xref linkend=\"setupBootloader\"/>"
+
+#~ msgid "<guilabel>User management</guilabel>"
+#~ msgstr "<guilabel>用户管理</guilabel>"
+
+#~ msgid "<guilabel>Services</guilabel>:"
+#~ msgstr "<guilabel>服务</guilabel>:"
+
+#~ msgid "For more information, see <xref linkend=\"configureServices\"/>"
+#~ msgstr "更多信息，参见 <xref linkend=\"configureServices\"/>."
+
+#~ msgid "<guilabel>Keyboard</guilabel>:"
+#~ msgstr "<guilabel>键盘</guilabel>:"
+
+#~ msgid "<guilabel>Mouse</guilabel>:"
+#~ msgstr "<guilabel>鼠标</guilabel>:"
+
+#~ msgid "<guilabel>Sound card</guilabel>:"
+#~ msgstr "<guilabel>声卡</guilabel>:"
+
+#, fuzzy
+#~ msgid ""
+#~ "The installer uses the default driver - if there is a default one. The "
+#~ "option to select a different driver is only given when there is more than "
+#~ "one driver for your card, but where none of them is the default one."
+#~ msgstr ""
+#~ "安装器将会使用默认驱动（如果有的话）。只有存在多个可用驱动（且均不是默认驱"
+#~ "动）时，才会提示您进行选择。"
+
+#~ msgid "<guilabel>Graphical interface</guilabel>:"
+#~ msgstr "<guilabel>图形界面</guilabel>:"
+
+#~ msgid "<guilabel>Network</guilabel>:"
+#~ msgstr "<guilabel>网络</guilabel>:"
+
+#~ msgid "<guilabel>Proxies</guilabel>:"
+#~ msgstr "<guilabel>代理</guilabel>："
+
+#~ msgid "<guilabel>Security Level</guilabel>:"
+#~ msgstr "<guilabel>安全等级</guilabel>："
+
+#~ msgid "Check the option which best suits your usage."
+#~ msgstr "请勾选您认为合适的选项。"
+
+#~ msgid "<guilabel>Firewall</guilabel>:"
+#~ msgstr "<guilabel>防火墙</guilabel>："
+
+#~ msgid ""
+#~ "A firewall is intended to be a barrier between your important data and "
+#~ "the rascals out there on the internet who would compromise or steal it."
+#~ msgstr "防火墙将保护您的重要数据，以免其被他人恶意利用或窃取。"
+
+#~ msgid ""
+#~ "Select the services that you wish to have access to your system. Your "
+#~ "selections will depend on what you use your computer for. For more "
+#~ "information, see <xref linkend=\"firewall\"/>."
+#~ msgstr ""
+#~ "选择您需要使用的服务，这取决与您希望如何使用您的计算机。有关更多信息，请参"
+#~ "见 <xref linkend=\"firewall\"/>。"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" "
+#~ "align=\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" "
+#~ "align=\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </"
+#~ "imageobject>"
+
+#~ msgid "64 bit architecture only."
+#~ msgstr "仅支持 64 位处理器。"
+
+#, fuzzy
+#~ msgid ""
+#~ "md5sum and sha1sum are tools to check the ISO integrity. Choose one or "
+#~ "the other, and copy the checksum <link linkend=\"integrity\">for later "
+#~ "use</link>. Then a window similar to this one appears:"
+#~ msgstr ""
+#~ "md5sum 和 sha1sum 是用于检查 ISO 文件完整性的工具，只需使用其中一种即可。"
+#~ "请您保留它们以便<link linkend=\"integrity\">后续使用</link>。之后，窗口将"
+#~ "会显示："
+
+#~ msgid ""
+#~ "To recover the original capacity, you must redo partitioning and re-"
+#~ "format the USB stick."
+#~ msgstr "若要恢复原始容量，您必须重新进行分区和格式化操作。"
+
+#~ msgid "Install"
+#~ msgstr "安装"
+
+#~ msgid "Upgrade"
+#~ msgstr "升级"
+
+#, fuzzy
+#~ msgid ""
+#~ "If during install you decide to stop the installation, it is possible to "
+#~ "reboot, but please think twice before you do this. Once a partition has "
+#~ "been formatted or updates have started to be installed, your computer "
+#~ "isn't in the same state anymore and rebooting it could very well leave "
+#~ "you with an unusable system. If in spite of that, and only if you are "
+#~ "very sure rebooting is what you want, go to a text terminal by pressing "
+#~ "<guilabel>Alt Ctrl F2</guilabel> simultaneously. After that, press "
+#~ "<guilabel>Alt Ctrl Delete</guilabel> simultaneously to reboot."
+#~ msgstr ""
+#~ "若安装过程在某一步中断，您可以选择重启，但请三思而后行。一旦分区被格式化，"
+#~ "或升级过程开始，电脑中的内容将发生变化，此时重启可能导致系统无法使用。若您"
+#~ "确定要重启，可以按 <guibutton>Alt Ctrl F2</guibutton> 切换到终端，然后按"
+#~ "下 <guibutton>Alt Ctrl Delete</guibutton> 来触发重启操作。"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"selectKeyboardLive-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"selectKeyboardLive-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "You will be required to set the keyboard layout you wish to use in Mageia​​"
+#~ ". The default one is selected according to your language and timezone "
+#~ "previously selected."
+#~ msgstr ""
+#~ "您需要选择在 Mageia 中使用的键盘布局。默认布局已根据您之前的语言和时区设置"
+#~ "进行选择。"
+
+#~ msgid "Mageia uses UTF-8 (Unicode) support by default."
+#~ msgstr "Mageia 默认使用 UTF-8（Unicode）格式。"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
+#~ "format=\"PNG\" > </imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
+#~ "format=\"PNG\" > </imagedata> </imageobject>"
+
+#~ msgid "By default, Mageia uses exclusively:"
+#~ msgstr "默认情况下，Mageia 仅使用："
+
+#, fuzzy
+#~ msgid "GRUB2-efi for a UEFI system."
+#~ msgstr "GRUB2-efi，当使用 UEFI 硬件时。"
+
+#, fuzzy
+#~ msgid "The Mageia graphical menus are nice :)"
+#~ msgstr "Mageia 的图形化菜单："
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref="
+#~ "\"live-setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref="
+#~ "\"live-setupBootloader.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless "
+#~ "you really know what you are doing."
+#~ msgstr "若您不确定如何操作，请不要修改“引导设备”。"
+
+#, fuzzy
+#~ msgid ""
+#~ "With a UEFI system, the user interface is slightly different as you "
+#~ "cannot choose between the <emphasis role=\"bold\">with</emphasis> or "
+#~ "<emphasis role=\"bold\">without graphical menu</emphasis> options."
+#~ msgstr ""
+#~ "对于 UEFI，用户界面会稍有不同，您将无法选择引导器（因为只能使用 Grub2-"
+#~ "efi）。"
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "By default, and according to your system, Mageia writes one of the "
+#~ "following:"
+#~ msgstr "默认情况下，根据您的硬件情况，Mageia 会将："
+
+#, fuzzy
+#~ msgid "a GRUB2-efi bootloader into the ESP"
+#~ msgstr "GRUB2-efi 引导器安装至 ESP"
+
+#~ msgid "Using chain loading"
+#~ msgstr "使用链式加载（chain loading）"
+
+#, fuzzy
+#~ msgid ""
+#~ "If you don't want a bootable Mageia, but to chain-load it from another "
+#~ "OS, click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
+#~ "guibutton> and tick the box <guilabel>Do not touch ESP or MBR</guilabel>."
+#~ msgstr ""
+#~ "若您不需要 Mageia 安装引导器，而是希望从其他系统引导 Mageia，请点击"
+#~ "<guibutton>下一步</guibutton>，然后点击<guibutton>高级</guibutton>并勾选 "
+#~ "<guilabel>不要修改 ESP 或 MBR</guilabel>。"
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid ""
+#~ "You will get a warning that the bootloader is missing, ignore it by "
+#~ "clicking <guibutton>OK</guibutton>."
+#~ msgstr ""
+#~ "安装程序将会提醒您缺少引导器，请忽略它并点击<guibutton>确定</guibutton>。"
+
+#~ msgid "First page"
+#~ msgstr "第一页"
+
+#~ msgid "<guilabel>Advanced</guilabel>"
+#~ msgstr "<guilabel>高级</guilabel>"
+
+#~ msgid "Next page"
+#~ msgstr "下一页"
+
+#~ msgid ""
+#~ "<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
+#~ "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
+#~ msgstr ""
+#~ "<guilabel>探测其他系统</guilabel>：参见<link linkend="
+#~ "\"setupMageiaBootloader\">使用 Mageia 引导器</link>"
+
+#~ msgid ""
+#~ "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above "
+#~ "<link linkend=\"setupChainLoading\">Using the chain loading</link>"
+#~ msgstr ""
+#~ "<emphasis role=\"bold\">不要修改 ESP 或 MBR</emphasis>：参见<link linkend="
+#~ "\"setupChainLoading\">使用链式加载</link>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" "
+#~ "align=\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+#~ "align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
+
+#~ msgid "DrakX should then be able to configure the drive(s) correctly."
+#~ msgstr "随后 DrakX 应当能正确配置这些驱动器。"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" "
+#~ "xml:id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" "
+#~ "xml:id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "In this screen the name of the driver that the installer chose for your "
+#~ "sound card is given, which will be the default driver if one exists."
+#~ msgstr ""
+#~ "这一界面中列出了安装程序为声卡选定的驱动，如果有默认驱动则将其作为默认配"
+#~ "置。"
+
+#~ msgid ""
+#~ "The default driver should work without problems. However, if after "
+#~ "install you do encounter problems, then run <command>draksound</command> "
+#~ "or start this tool via MCC (Mageia Control Center), by choosing the "
+#~ "<guilabel>Hardware</guilabel> tab and clicking on <guilabel>Sound "
+#~ "Configuration</guilabel> at the top right of the screen."
+#~ msgstr ""
+#~ "默认驱动通常不会出问题。不过，如果您在安装后遇到问题，请运行 "
+#~ "<command>draksound</command>，或通过 MCC（Mageia 控制中心）中<guilabel>硬"
+#~ "件</guilabel>选项卡中的<guilabel>声音配置</guilabel>来启动 draksound。"
+
+#, fuzzy
+#~ msgid ""
+#~ "Then, in the <emphasis role=\"bold\">draksound</emphasis> or <emphasis "
+#~ "role=\"bold\">Sound Configuration</emphasis> tool screen, click on "
+#~ "<guibutton>Troubleshooting</guibutton> to find useful advice about how to "
+#~ "solve the problem."
+#~ msgstr ""
+#~ "在 draksound 或“声音配置”工具界面，点击<guibutton>高级</guibutton>、"
+#~ "<guibutton>故障排除</guibutton>来查看解决问题的建议。"
+
+#, fuzzy
+#~ msgid ""
+#~ "Clicking <emphasis role=\"bold\"><guibutton>Advanced</guibutton></"
+#~ "emphasis> in this screen, during install, is useful if there is no "
+#~ "default driver and there are several drivers available, but you think the "
+#~ "installer selected the wrong one."
+#~ msgstr ""
+#~ "若没有默认驱动，或者默认驱动选择错误，则可以安装时点击此界面中的"
+#~ "<guibutton>Advanced</guibutton>来更正。"
+
+#, fuzzy
+#~ msgid ""
+#~ "In that case you can select a different driver after clicking on "
+#~ "<emphasis role=\"bold\"><guibutton>Let me pick any driver</guibutton></"
+#~ "emphasis>."
+#~ msgstr ""
+#~ "`在这种情况下，您可以在点击<guibutton>让我选择任意驱动</guibutton>来选择其"
+#~ "他驱动程序。"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-"
+#~ "takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
+#~ "takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition='live'> <imagedata fileref=\"live-"
+#~ "takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </"
+#~ "imageobject> <imageobject condition='classical'> <imagedata fileref=\"dx2-"
+#~ "takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "You get this screen if you selected \"Boot Mageia\". If not, you get the "
+#~ "\"<link linkend=\"doPartitionDisks\">Partitioning</link> step\""
+#~ msgstr ""
+#~ "如果选择了“引导Mageia”，您将看到此界面。如果没有，你将看到“<link linkend="
+#~ "\"doPartitionDisks\">分区</link>”界面。"
+
 #~ msgid ""
 #~ "<guilabel>Password (again)</guilabel>: Retype the user password into this "
 #~ "text box and drakx will check you have the same password in each of the "
@@ -5072,22 +6112,6 @@ msgstr ""
 #~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> "
 #~ "</imagedata> </imageobject>"
 
-#~ msgid ""
-#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-#~ "configureX_monitor.png\" format=\"PNG\" revision=\"1\" xml:id="
-#~ "\"configureX_monitor-im1\"/> </imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-#~ "configureX_monitor.png\" format=\"PNG\" revision=\"1\" xml:id="
-#~ "\"configureX_monitor-im1\"/> </imageobject>"
-
-#~ msgid ""
-#~ "There is a tab for every detected hard disk or other storage device, like "
-#~ "an USB key. For example sda, sdb and sdc if there are three of them."
-#~ msgstr ""
-#~ "每个硬盘及其他存储设备（如 U 盘）都在对应的标签页中显示。例如，在三个标签"
-#~ "页中分别显示 sda、sdb、sdc 的磁盘布局。"
-
 #, fuzzy
 #~ msgid ""
 #~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
@@ -5192,15 +6216,6 @@ msgstr ""
 #~ "imagedata> </imageobject>"
 
 #~ msgid ""
-#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection."
-#~ "png\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection."
-#~ "png\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-#~ "imageobject>"
-
-#~ msgid ""
 #~ "If selected, \"With X\" will also include IceWM as lightweight desktop "
 #~ "environment."
 #~ msgstr "若选中“包含 X”，将会同时选定 IceWM 作为轻量级的桌面环境。"
@@ -5258,11 +6273,6 @@ msgstr ""
 #~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
 
 #~ msgid ""
-#~ "Use this option for a fresh <application>Mageia</application> "
-#~ "installation."
-#~ msgstr "使用此选项来进行全新 <application>Mageia</application> 安装。"
-
-#~ msgid ""
 #~ "If you have one or more <application>Mageia</application> installations "
 #~ "on your system, the installer will allow you to upgrade one of them to "
 #~ "the latest release."
@@ -5293,9 +6303,6 @@ msgstr ""
 #~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
 #~ "align=\"center\"/> </imageobject>"
 
-#~ msgid "Custom"
-#~ msgstr "自定义"
-
 #~ msgid ""
 #~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
 #~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"