aboutsummaryrefslogtreecommitdiffstats
path: root/docs/installer/zh_CN.po
diff options
context:
space:
mode:
Diffstat (limited to 'docs/installer/zh_CN.po')
-rw-r--r--docs/installer/zh_CN.po1709
1 files changed, 1060 insertions, 649 deletions
diff --git a/docs/installer/zh_CN.po b/docs/installer/zh_CN.po
index eb317bc0..c5cbb94d 100644
--- a/docs/installer/zh_CN.po
+++ b/docs/installer/zh_CN.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-07-17 11:30+0300\n"
+"POT-Creation-Date: 2017-02-10 19:18+0200\n"
"PO-Revision-Date: 2016-07-17 12:01+0300\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -177,26 +177,15 @@ msgstr ""
msgid "User and Superuser Management"
msgstr "用户和管理员管理"
-#. Started by marja,using Led43's text, on 2012 03 27
-#. NEEDS TO BE REVIEWED!
-#. SimonNZG 2012-04-03 has taken a look but needs to come back
-#. removed para xml:id's, finished the page using Led43's text in the wiki, but
-#. changed his text about the Advanced User Managment screen (the only thing
-#. about guest account there, is the box you can tick or untick to enable or
-#. disable it, the rest is about the normal user you're adding in the previous
-#. screen), marja, 20120409
-#. barjac 2012-04-13 moved explanation of xguest lower down. I don't understand
-#. "rbash" in the xguest warning - is that correct?
-#. JohnR 2012-04-19 Language proofreading
-#. marja 2012-04-24 Added screenshot
-#. marja 2013-04-26 added new note
+#. Lebarhon: 20170210 updated for Mageia 6 (umask)
#. type: Content of: <section><mediaobject>
-#: en/addUser.xml:28
+#: en/addUser.xml:9
+#, fuzzy
msgid ""
-"<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
-"\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
-"\" format=\"PNG\"/> </imageobject> <imageobject> <imagedata format=\"PNG\" "
-"fileref=\"live-user1.png\"/> </imageobject>"
+"<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>"
msgstr ""
"<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
"\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
@@ -204,12 +193,12 @@ msgstr ""
"fileref=\"live-user1.png\"/> </imageobject>"
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:39
+#: en/addUser.xml:20
msgid "Set Administrator (root) Password:"
msgstr "设置管理员(root 账户)密码:"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:43
+#: en/addUser.xml:24
msgid ""
"It is advisable for all <application>Mageia</application> installations to "
"set a superuser or administrator's password, usually called the "
@@ -226,7 +215,7 @@ msgstr ""
"较高。你需要在下方输入框中再次输入相同的密码,以确保你之前的密码没有输错。"
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:34
msgid ""
"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."
@@ -235,12 +224,12 @@ msgstr ""
"符。"
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:61
+#: en/addUser.xml:42
msgid "Enter a user"
msgstr "输入用户名"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:64
+#: en/addUser.xml:45
msgid ""
"Add a user here. A user has fewer rights than the superuser (root), but "
"enough to surf the internet, use office applications or play games and "
@@ -250,21 +239,21 @@ msgstr ""
"公软件或者玩游戏等是足够的。"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:70
+#: en/addUser.xml:51
msgid ""
"<guibutton>Icon</guibutton>: if you click on this button it will change the "
"users icon."
msgstr "<guibutton>图标</guibutton>:若点击此按钮,则会改变用户图标。"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:75
+#: en/addUser.xml:56
msgid ""
"<guilabel>Real Name</guilabel>: Insert the users real name into this text "
"box."
msgstr "<guilabel>真实姓名</guilabel>:在文本框中输入用户的真名。"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
msgid ""
"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
"drakx use a version of the users real name. <emphasis>The login name is case "
@@ -274,7 +263,7 @@ msgstr ""
"置。<emphasis>登录名区分大小写。</emphasis>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: en/addUser.xml:67
msgid ""
"<guilabel>Password</guilabel>: In this text box you should type in the user "
"password. There is a shield at the end of the text box that indicates the "
@@ -284,7 +273,7 @@ msgstr ""
"码强度。(参见 <xref linkend=\"givePassword\"/>)"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: en/addUser.xml:73
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 user "
@@ -294,53 +283,36 @@ msgstr ""
"的密码是否一致。"
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:99
+#: en/addUser.xml:80
+#, fuzzy
msgid ""
-"Any user you add while installing Mageia, will have a world readable (but "
-"write protected) home directory."
+"Any user you add while installing Mageia, will have a both read and write "
+"protected home directory (umask=0027)."
msgstr "任何在安装 Mageia 时添加的用户将拥有一个全局可读(但写保护)的主目录。"
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:102
-msgid ""
-"However, while using your new install, any user you add in <emphasis>MCC - "
-"System - Manage users on system</emphasis> will have a home directory that "
-"is both read and write protected."
-msgstr ""
-"不过,在使用系统时,通过 <emphasis>Mageia 控制中心 - 系统 -管理系统用户</"
-"emphasis>添加的用户将拥有其他用户不可读且不可写的主目录。"
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:106
-msgid ""
-"If you don't want a world readable home directory for anyone, it is advised "
-"to only add a temporary user now and to add the real one(s) after reboot."
-msgstr ""
-"若您不希望为任何人创建全局可读的主目录,则现在最好只添加一个临时用户,然后在"
-"重启后添加您所需要的用户。"
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:110
+#: en/addUser.xml:83
+#, fuzzy
msgid ""
-"If you prefer world readable home directories, you might want to add all "
-"extra needed users in the <emphasis>Configuration - Summary</emphasis> step "
-"during the install. Choose <emphasis>User management</emphasis>."
+"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"emphasis> step during the install. Choose <emphasis>User management</"
+"emphasis>."
msgstr ""
"若您需要全局可读主目录,你可能需要在安装的<emphasis>配置 - 概要</emphasis>这"
"一步中添加有此需要的用户。请在<emphasis>用户管理</emphasis>中进行此操作。。"
#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:115
+#: en/addUser.xml:87
msgid "The access permissions can also be changed after the install."
msgstr "也可以在安装完成后改变访问权限。"
#. type: Content of: <section><section><info><title>
-#: en/addUser.xml:122
+#: en/addUser.xml:94
msgid "Advanced User Management"
msgstr "高级用户管理"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
msgid ""
"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
"screen that allows you to edit the settings for the user you are adding."
@@ -349,12 +321,12 @@ msgstr ""
"设置。"
#. type: Content of: <section><section><para>
-#: en/addUser.xml:129
+#: en/addUser.xml:101
msgid "Additionally, you can disable or enable a guest account."
msgstr "此外,您还可以禁用或启用来宾账户。"
#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:133
+#: en/addUser.xml:105
msgid ""
"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
"saves to his /home directory will be erased when he logs out. The guest "
@@ -364,7 +336,7 @@ msgstr ""
"应当将他/她的临时文件存储于 U 盘等设备中。"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:140
+#: en/addUser.xml:112
msgid ""
"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
"guest account. The guest account allows a guest to log into and use the PC, "
@@ -374,7 +346,7 @@ msgstr ""
"来宾登录并使用电脑,但对其使用更严格的访问权限控制。"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:147
+#: en/addUser.xml:119
msgid ""
"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
"shell used by the user you are adding in the previous screen, options are "
@@ -384,7 +356,7 @@ msgstr ""
"中添加),可能的选项有 Bash、Dash 和 Sh。"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:153
+#: en/addUser.xml:125
msgid ""
"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
"are adding in the previous screen. This is a number. Leave it blank unless "
@@ -394,7 +366,7 @@ msgstr ""
"您不确定如何设置,请将其留空。"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:159
+#: en/addUser.xml:131
msgid ""
"<guilabel>Group ID</guilabel>: This lets you set the group ID. Also a "
"number, usually the same one as for the user. Leave it blank unless you know "
@@ -739,19 +711,19 @@ msgstr ""
"\">Live 模式下会有额外的步骤</link>。"
#. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:5
+#: en/chooseDesktop.xml:3
msgid "Desktop Selection"
msgstr "桌面环境选择"
#. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
+#: en/chooseDesktop.xml:8
msgid ""
"Depending on your selection here, you may be offered further screens to fine "
"tune your choice."
msgstr "根据所选项不同,随后会出现不同的窗口用于详细设置。"
#. type: Content of: <section><para>
-#: en/chooseDesktop.xml:13
+#: en/chooseDesktop.xml:11
msgid ""
"After the selection step(s), you will see a slide show during package "
"installation. The slide show can be disabled by pressing the "
@@ -761,16 +733,17 @@ msgstr ""
"guilabel> 按钮来关闭幻灯片显示。"
#. type: Content of: <section><mediaobject>
-#: en/chooseDesktop.xml:20
+#: en/chooseDesktop.xml:16
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
+"</imageobject>"
#. type: Content of: <section><para>
-#: en/chooseDesktop.xml:26
+#: en/chooseDesktop.xml:21
msgid ""
"Choose whether you prefer to use the <application>KDE</application> or "
"<application>Gnome</application> desktop environment. Both come with a full "
@@ -787,22 +760,23 @@ msgstr ""
"安装的软件包也更少。"
#. type: Content of: <section><info><title>
-#: en/choosePackageGroups.xml:4
+#: en/choosePackageGroups.xml:3
msgid "Package Group Selection"
msgstr "选择软件包组"
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
+#. Lebarhon 20170209 Updated SC
#. type: Content of: <section><mediaobject>
-#: en/choosePackageGroups.xml:10
+#: en/choosePackageGroups.xml:9
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
msgstr ""
"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
#. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:16
+#: en/choosePackageGroups.xml:14
msgid ""
"Packages have been sorted into groups, to make choosing what you need on "
"your system a lot easier. The groups are fairly self explanatory, however "
@@ -813,32 +787,33 @@ msgstr ""
"鼠标移至该组的名称上方。"
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:23
+#: en/choosePackageGroups.xml:21
msgid "Workstation."
msgstr "工作区"
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:27
+#: en/choosePackageGroups.xml:25
msgid "Server."
msgstr "服务器。"
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:31
+#: en/choosePackageGroups.xml:29
msgid "Graphical Environment."
msgstr "图形界面环境"
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:35
+#: en/choosePackageGroups.xml:33
msgid ""
"Individual Package Selection: You can use this option to manually add or "
"remove packages."
msgstr "单独选择软件包:您可以使用此选项来手动添加/移除软件包。"
#. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:39
+#: en/choosePackageGroups.xml:38
+#, fuzzy
msgid ""
-"Read <xref linkend=\"minimal-install\"></xref> for instructions on how to do "
-"a minimal install (without or with X &amp; IceWM)."
+"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a "
+"minimal install (without or with X &amp; IceWM)."
msgstr ""
"若要进行最小化安装(包含/不包含 X &amp; IceWM),请阅读 <xref linkend="
"\"minimal-install\"></xref>。"
@@ -1275,23 +1250,24 @@ msgstr ""
"性。推荐保留此选项。"
#. type: Content of: <section><info><title>
-#: en/diskdrake.xml:20
+#: en/diskdrake.xml:7
msgid "Custom disk partitioning with DiskDrake"
msgstr "使用 DiskDrake 自定义磁盘分区方式"
#. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:25
+#: en/diskdrake.xml:12
+#, fuzzy
msgid ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<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:34
+#: en/diskdrake.xml:22
msgid ""
"If you wish to use encryption on your <literal>/</literal> partition you "
"must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1302,7 +1278,7 @@ msgstr ""
"并且该分区不能被加密;否则,系统将无法启动。"
#. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: en/diskdrake.xml:29
msgid ""
"Adjust 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 "
@@ -1312,7 +1288,7 @@ msgstr ""
"时预览操作后的效果。"
#. type: Content of: <section><para>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:34
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."
@@ -1321,14 +1297,14 @@ msgstr ""
"分别显示 sda、sdb、sdc 的磁盘布局。"
#. type: Content of: <section><para>
-#: en/diskdrake.xml:50
+#: en/diskdrake.xml:38
msgid ""
"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
"storage device"
msgstr "点击 <guibutton>全部清除</guibutton> 可以删除所选设备上的全部分区。"
#. type: Content of: <section><para>
-#: en/diskdrake.xml:53
+#: en/diskdrake.xml:41
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."
@@ -1337,43 +1313,77 @@ msgstr ""
"点,改变其大小或擦除它。"
#. type: Content of: <section><para>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:45
msgid "Continue until you adjusted everything to your wishes."
msgstr "请继续,直到所需操作完成。"
#. type: Content of: <section><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:48
msgid "Click <guibutton>Done</guibutton> when you're ready."
msgstr " 准备好时点击<guibutton>完成</guibutton>按钮。"
#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:64
+#: en/diskdrake.xml:52
+#, fuzzy
msgid ""
"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
-"System Partition) is present and correctly mounted on /boot/EFI (see above)"
+"System Partition) is present and correctly mounted on /boot/EFI (see below)"
msgstr ""
"若您将 Mageia 安装在 UEFI 系统中,请确保磁盘上存在 ESP(EFI 系统分区)并被正"
"确挂载至 /boot/EFI(见下)。"
#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:57
msgid ""
"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
msgstr ""
"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:68 en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:61
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:56
+#, fuzzy
+msgid ""
+"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
+"\" id=\"1\"/>"
msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:68
+#, fuzzy
+msgid ""
+"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
+"partition is present with a correct type"
+msgstr ""
+"若您将 Mageia 安装在 UEFI 系统中,请确保磁盘上存在 ESP(EFI 系统分区)并被正"
+"确挂载至 /boot/EFI(见下)。"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/diskdrake.xml:72
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
+"> </imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
#. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:7
+#: en/doPartitionDisks.xml:9
msgid "Partitioning"
msgstr "分区"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:10
+#: en/doPartitionDisks.xml:12
msgid ""
"In this screen you can see the content of your hard drive(s) and see the "
"solutions the DrakX partitioning wizard found for where to install "
@@ -1383,28 +1393,39 @@ msgstr ""
"<application>Mageia</application> 的安装方法。"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:15
+#: en/doPartitionDisks.xml:17
msgid ""
"The options available from the list below will vary depending on your "
"particular hard drive(s) layout and content."
msgstr "根据特定硬盘布局和内容的不同,下列选项可能会有所不同。"
#. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:20
+#: en/doPartitionDisks.xml:22
+#, fuzzy
msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
"\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
-"\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:28
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:35
msgid "Use Existing Partitions"
msgstr "使用现存的分区"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:38
msgid ""
"If this option is available, then existing Linux compatible partitions have "
"been found and may be used for the installation."
@@ -1413,31 +1434,31 @@ msgstr ""
"安装。"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:44
msgid "Use Free Space"
msgstr "使用空闲空间"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:46
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:44
+#: en/doPartitionDisks.xml:52
msgid "Use Free Space on a Windows Partition"
msgstr "使用 Windows 分区中的空闲空间"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:47
+#: en/doPartitionDisks.xml:55
msgid ""
"If you have unused space on an existing Windows partition, the installer may "
"offer to use it."
msgstr "若现存 Windows 分区中有空闲空间,安装程序将把 Mageia 安装在此处。"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:59
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 "
@@ -1447,7 +1468,7 @@ msgstr ""
"所有重要文件!"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:64
msgid ""
"Note that this involves shrinking the size of the Windows partition. The "
"partition must be \"clean\", meaning that Windows must have closed down "
@@ -1461,7 +1482,7 @@ msgstr ""
"移出待使用区域。我们推荐您对个人文件进行备份后再进行此操作。"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:72
msgid ""
"With this option, the installer displays the remaining Windows partition in "
"light blue and the future Mageia partition in dark blue with their intended "
@@ -1473,7 +1494,7 @@ msgstr ""
"图)。"
#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:71
+#: en/doPartitionDisks.xml:79
msgid ""
"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
"imageobject>"
@@ -1481,23 +1502,33 @@ msgstr ""
"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
"imageobject>"
+#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
+#: en/doPartitionDisks.xml:85
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:78
+#: en/doPartitionDisks.xml:92
msgid "Erase and use Entire Disk."
msgstr "擦除磁盘,并使用整个磁盘。"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:81
+#: en/doPartitionDisks.xml:95
msgid "This option will use the complete drive for Mageia."
msgstr "此选项将会把整个硬盘空间用于安装 Mageia。"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:84
+#: en/doPartitionDisks.xml:98
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:87
+#: en/doPartitionDisks.xml:101
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 "
@@ -1507,60 +1538,60 @@ msgstr ""
"要使用此选项。"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:108
msgid "Custom"
msgstr "自定义"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:96
+#: en/doPartitionDisks.xml:110
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:102
+#: en/doPartitionDisks.xml:116
msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
msgstr "<emphasis role=\"bold\">分区大小:</emphasis>"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:104
+#: en/doPartitionDisks.xml:118
msgid ""
"The installer will share the available place out according to the following "
"rules:"
msgstr "安装程序将会根据下列规则使用可用空间:"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:109
+#: en/doPartitionDisks.xml:123
msgid ""
"If the total available place is lower than 50 GB, only one partition is "
"created for /, there is no separate partition for /home."
msgstr "若可用空间小于 50GB,则只创建 / 分区,不创建单独的 /home 分区。"
#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:129
msgid ""
"If the total available place is over 50 GB, then three partitions are created"
msgstr "若总可用空间大于 50GB,则创建三个分区。"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:120
+#: en/doPartitionDisks.xml:134
msgid ""
"6/19 of the total available place is allocated to / with a maximum of 50 GB"
msgstr "其中 6/19 被分配给 / 分区,最大不超过 50GB"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:139
msgid "1/19 is allocated to swap with a maximum of 4 GB"
msgstr "1/19 被分配给交换分区,最大不超过 4GB"
#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:129
+#: en/doPartitionDisks.xml:143
msgid "the rest (at least 12/19) is allocated to /home"
msgstr "剩余部分(至少 12/19)被分配给 /home 分区"
#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:149
msgid ""
"That means that from 160 GB and over of available place, the installer will "
"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1569,7 +1600,7 @@ msgstr ""
"及 106GB 的 /home 分区。"
#. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:140
+#: en/doPartitionDisks.xml:154
msgid ""
"If you are using an UEFI system, the ESP (EFI System Partition) will be "
"automatically detected, or created if it does not exist yet, and mounted on /"
@@ -1579,8 +1610,48 @@ msgstr ""
"若您使用 UEFI 系统,将自动检测并创建 ESP(EFI 系统分区),之后将其挂载到 /"
"boot/EFI。“自定义”选项仅用于检测该操作的结果是否正确"
+#. type: Content of: <section><note><para>
+#: en/doPartitionDisks.xml:161
+msgid ""
+"If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
+"you need to create a Bios boot partition if not already existing. It is an "
+"about 1 MiB partition with no mount point. Choose the \"Custom disk "
+"partitioning\" option to be able to create it with the Installer like any "
+"other partition, just select BIOS boot partition as filesystem type."
+msgstr ""
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:169
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:175
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:181
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:147
+#: en/doPartitionDisks.xml:188
msgid ""
"Some newer drives are now using 4096 byte logical sectors, instead of the "
"previous standard of 512 byte logical sectors. Due to lack of available "
@@ -1595,17 +1666,17 @@ msgstr ""
"议您使用其他的分区工具(如gparted)预先进行分区操作:"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:155
+#: en/doPartitionDisks.xml:196
msgid "\"Align to\" \"MiB\""
msgstr "“对齐到”“MiB”"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:198
msgid "\"Free space preceding (MiB)\" \"2\""
msgstr "“前面的自由空间(MiB)”“2”"
#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:159
+#: en/doPartitionDisks.xml:200
msgid ""
"Also make sure all partitions are created with an even number of megabytes."
msgstr "确保所有创建的分区的大小均为偶数倍 MB。"
@@ -1713,27 +1784,24 @@ msgid "Mageia 4"
msgstr "Mageia 4"
#. type: Content of: <section><info><title>
-#: en/exitInstall.xml:4
+#: en/exitInstall.xml:3
msgid "Congratulations"
msgstr "恭喜"
-#. Started by marja on 2012 03 29
-#. NEEDS TO BE WRITTEN AND THEN REVIEWED!
-#. marja - 2012-04-24 added screenshot and text
-#. same day, added "s" to "sytems"
+#. Lebarhon 20170209 updated SC
#. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:9
+#, fuzzy
msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
msgstr ""
"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
"imageobject>"
#. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: en/exitInstall.xml:14
msgid ""
"You have finished installing and configuring <application>Mageia</"
"application> and it is now safe to remove the installation medium and reboot "
@@ -1741,7 +1809,7 @@ msgid ""
msgstr "您以完成安装和配置 Mageia,现在可以安全地移除安装介质并重新启动。"
#. type: Content of: <section><para>
-#: en/exitInstall.xml:25
+#: en/exitInstall.xml:18
msgid ""
"After reboot, in the bootloader screen, you can choose between the operating "
"systems on your computer (if you have more than one)."
@@ -1750,19 +1818,19 @@ msgstr ""
"统)。"
#. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:22
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:31
+#: en/exitInstall.xml:26
msgid "Enjoy!"
msgstr "Enjoy!"
#. type: Content of: <section><para>
-#: en/exitInstall.xml:33
+#: en/exitInstall.xml:28
msgid ""
"Visit www.mageia.org if you have any questions or want to contribute to "
"Mageia"
@@ -1885,6 +1953,11 @@ msgstr ""
"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
#. type: Content of: <section><mediaobject>
#: en/installer.xml:49
msgid ""
@@ -2493,30 +2566,16 @@ msgstr ""
msgid "Summary of miscellaneous parameters"
msgstr "一些杂项"
-#. Started by marja on 2012 03 31
-#. NEEDS TO BE WRITTEN AND REVIEWED!
-#. marja - 2012 04 15 added some text, not much, unfortunately :(
-#. marja 2012-04-24 added screenshots
-#. JohnR 2012-04-25 Added text as requested by Psec :-)
-#. marja 2012-04-24 added 2 links to other help pages
-#. marja 2012-04-24 added some text in the drakxid-configureServices and
-#. the drakxid-miscellaneous section
-#. marja 2012-04-24 corrected "Magaia" in the last paragraph
-#. marja 2012-04-24 corrected para xml:id number in the last paragraph
-#. 2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc.
-#. 2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader"
-#. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry, configureServices and SecurityLevel out to separate files
+#. Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC
#. type: Content of: <section><mediaobject>
-#: en/misc-params.xml:33
+#: en/misc-params.xml:10
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
#. type: Content of: <section><para>
-#: en/misc-params.xml:38
+#: en/misc-params.xml:15
msgid ""
"DrakX made smart choices for the configuration of your system depending on "
"the choices you made and on the hardware DrakX detected. You can check the "
@@ -2526,18 +2585,40 @@ msgstr ""
"DrakX 会根据您的选择以及检测到的硬件自动生成合适的配置。您可以在此处检查或更"
"改它们(点击 <guibutton>配置</guibutton> 按钮)。"
+#. type: Content of: <section><note><para>
+#: en/misc-params.xml:21
+msgid ""
+"As a general rule, default settings are recommended and you can keep them "
+"with 3 exceptions:"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:24
+msgid "there are known issues with a default setting"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:28
+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
+msgid "something else is said in the detailed sections below"
+msgstr ""
+
#. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:45
+#: en/misc-params.xml:39
msgid "System parameters"
msgstr "系统参数"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:50
+#: en/misc-params.xml:44
msgid "<guilabel>Timezone</guilabel>"
msgstr "<guilabel>时区</guilabel>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:46
msgid ""
"DrakX selected a time zone for you, depending on your preferred language. "
"You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
@@ -2547,12 +2628,12 @@ msgstr ""
"linkend=\"configureTimezoneUTC\"/>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:58
+#: en/misc-params.xml:52
msgid "<guilabel>Country / Region</guilabel>"
msgstr "<guilabel>国家/地区</guilabel>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:55
msgid ""
"If you are not in the selected country, it is very important that you "
"correct the setting. See <xref linkend=\"selectCountry\"/>"
@@ -2561,33 +2642,33 @@ msgstr ""
"\"selectCountry\"/>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:67
+#: en/misc-params.xml:61
msgid "<guilabel>Bootloader</guilabel>"
msgstr "<guilabel>引导器</guilabel>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:63
msgid "DrakX has made good choices for the bootloader setting."
msgstr "DrakX 为引导器进行了自动设置。"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:72
-msgid ""
-"Do not change anything, unless you know how to configure Grub and/or Lilo"
+#: en/misc-params.xml:66
+#, fuzzy
+msgid "Do not change anything, unless you know how to configure Grub2"
msgstr "不更改任何选项,除非您懂得如何配置 GRUB 和/或 Lilo"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:75
+#: en/misc-params.xml:69
msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
msgstr "更多信息,参见 <xref linkend=\"setupBootloader\"/>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:80
+#: en/misc-params.xml:74
msgid "<guilabel>User management</guilabel>"
msgstr "<guilabel>用户管理</guilabel>"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:77
msgid ""
"You can add extra users here. They will each get their own <literal>/home</"
"literal> directories."
@@ -2596,12 +2677,12 @@ msgstr ""
"目录。"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:83
msgid "<guilabel>Services</guilabel>:"
msgstr "<guilabel>服务</guilabel>:"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:91
+#: en/misc-params.xml:85
msgid ""
"System services refer to those small programs which run the background "
"(daemons). This tool allows you to enable or disable certain tasks."
@@ -2609,53 +2690,60 @@ msgstr ""
"系统服务指在后台运行的小程序(守护进程)。此工具允许您启用或禁用特定任务。"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:95
+#: en/misc-params.xml:89
msgid ""
"You should check carefully before changing anything here - a mistake may "
"prevent your computer from operating correctly."
msgstr "在做出更改之前,请认真审视选项 - 任何错误都可能导致系统无法正常运行。"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:99
+#: en/misc-params.xml:93
msgid "For more information, see <xref linkend=\"configureServices\"/>"
msgstr "更多信息,参见 <xref linkend=\"configureServices\"/>."
#. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:106
+#: en/misc-params.xml:100
msgid "Hardware parameters"
msgstr "硬件参数"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:111
+#: en/misc-params.xml:105
msgid "<guilabel>Keyboard</guilabel>:"
msgstr "<guilabel>键盘</guilabel>:"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:113
+#: en/misc-params.xml:107
msgid ""
"This is where you setup or change your keyboard layout which will depend on "
"your location, language or type of keyboard."
msgstr "在这里,您可以根据您所在的位置、使用的语言和键盘类型来设置键盘布局。"
+#. type: Content of: <section><section><itemizedlist><listitem><note><para>
+#: en/misc-params.xml:112
+msgid ""
+"If you notice a wrong keyboard layout and want to change it, keep in mind "
+"that your passwords are going to change too."
+msgstr ""
+
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:119
+#: en/misc-params.xml:118
msgid "<guilabel>Mouse</guilabel>:"
msgstr "<guilabel>鼠标</guilabel>:"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:121
+#: en/misc-params.xml:120
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
+#: en/misc-params.xml:125
msgid "<guilabel>Sound card</guilabel>:"
msgstr "<guilabel>声卡</guilabel>:"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
+#: en/misc-params.xml:128
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 "
@@ -2665,41 +2753,43 @@ msgstr ""
"动)时,才会提示您进行选择。"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:136
+#: en/misc-params.xml:135
msgid "<guilabel>Graphical interface</guilabel>:"
msgstr "<guilabel>图形界面</guilabel>:"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:139
+#: en/misc-params.xml:138
msgid "This section allows you to configure your graphic card(s) and displays."
msgstr "您可以在这里配置显卡和显示器。"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:142
+#: en/misc-params.xml:141
msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
msgstr "更多信息,参见 <xref linkend=\"configureX_chooser\"/>."
#. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:148
+#: en/misc-params.xml:147
+#, fuzzy
msgid ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
#. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:156
+#: en/misc-params.xml:155
msgid "Network and Internet parameters"
msgstr "网络和 Internet 参数"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:162
+#: en/misc-params.xml:161
msgid "<guilabel>Network</guilabel>:"
msgstr "<guilabel>网络</guilabel>:"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:164
+#: en/misc-params.xml:163
msgid ""
"You can configure your network here, but for network cards with non-free "
"drivers it is better to do that after reboot, in the <application>Mageia "
@@ -2710,19 +2800,19 @@ msgstr ""
"Nonfree 软件仓库,那么您最好等到重启后再进行这一操作。"
#. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:171
+#: en/misc-params.xml:170
msgid ""
"When you add a network card, do not forget to set your firewall to watch "
"that interface as well."
msgstr "当您添加了网卡后,请不要忘记用防火墙对该接口进行管理。"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:178
+#: en/misc-params.xml:177
msgid "<guilabel>Proxies</guilabel>:"
msgstr "<guilabel>代理</guilabel>:"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:180
+#: en/misc-params.xml:179
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 "
@@ -2732,51 +2822,53 @@ msgstr ""
"服务。"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:185
+#: en/misc-params.xml:184
msgid ""
"You may need to consult your systems administrator to get the parameters you "
"need to enter here"
msgstr "您可能需要咨询系统管理员来获取此处应当填写的参数"
#. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:194
+#: en/misc-params.xml:193
msgid "Security"
msgstr "安全"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:199
+#: en/misc-params.xml:198
msgid "<guilabel>Security Level</guilabel>:"
msgstr "<guilabel>安全等级</guilabel>:"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:202
+#: en/misc-params.xml:201
msgid ""
"Here you set the Security level for your computer, in most cases the default "
"setting (Standard) is adequate for general use."
msgstr "您可以在这里设置计算机的安全等级,一般情况下可以使用默认设置(标准)。"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:206
+#: en/misc-params.xml:205
msgid "Check the option which best suits your usage."
msgstr "请勾选您认为合适的选项。"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:211
+#: en/misc-params.xml:210
msgid "<guilabel>Firewall</guilabel>:"
msgstr "<guilabel>防火墙</guilabel>:"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:213
+#: en/misc-params.xml:212
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 "防火墙将保护您的重要数据,以免其被他人恶意利用或窃取。"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:217
+#: en/misc-params.xml:216
+#, fuzzy
msgid ""
"Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for."
+"selections will depend on what you use your computer for. For more "
+"information, see <xref linkend=\"firewall\"/>."
msgstr "请选择允许访问本系统的服务。您的选项应当基于计算机的期望用途。"
#. type: Content of: <section><section><itemizedlist><listitem><warning><para>
@@ -2785,31 +2877,52 @@ msgid "Bear in mind that allowing everything (no firewall) may be very risky."
msgstr "请牢记:允许所有服务(即不启用防火墙)是非常危险的。"
#. type: Content of: <section><info><title>
-#: en/reboot.xml:9
+#: en/reboot.xml:3
msgid "Reboot"
msgstr "重新启动"
-#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:13
+#. type: Content of: <section><para>
+#: en/reboot.xml:9
+#, fuzzy
msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"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>"
msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"在安装了引导起之后,程序将提示您关闭计算机,移除 Live CD 并重启计算机。重启"
+"后,您将会看到一个下载进度条,它将提示您正在下载的软件媒体(参见“软件管"
+"理”)。"
+
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:15
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
#. type: Content of: <section><para>
-#: en/reboot.xml:19
+#: en/reboot.xml:20
+#, fuzzy
msgid ""
-"Once the bootloader has been installed, you will be prompted to halt your "
-"computer, remove the live CD and restart the computer. When you restart, you "
-"will see a succession of download progress bars. These indicate that the "
-"software media are being downloaded (see Software management)."
+"When you restart, you will see a succession of download progress bars. "
+"These indicate that the software media are being downloaded (see Software "
+"management)."
msgstr ""
"在安装了引导起之后,程序将提示您关闭计算机,移除 Live CD 并重启计算机。重启"
"后,您将会看到一个下载进度条,它将提示您正在下载的软件媒体(参见“软件管"
"理”)。"
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:25
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.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><info><title>
#: en/resizeFATChoose.xml:16
msgid ""
@@ -2869,29 +2982,29 @@ msgstr ""
"调整安全设置。"
#. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:5
+#: en/SelectAndUseISOs2.xml:7
msgid "Select and use ISOs"
msgstr "选择和使用 ISO"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:11
msgid "Introduction"
msgstr "简介"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:13
msgid ""
"Mageia is distributed via ISO images. This page will help you to choose "
"which image match your needs."
msgstr "Mageia 通过 ISO 镜像进行分发。此页将帮助您选择所需的镜像。"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:14
+#: en/SelectAndUseISOs2.xml:16
msgid "There is two families of media:"
msgstr "有两种类型的媒介:"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:18
+#: en/SelectAndUseISOs2.xml:20
msgid ""
"Classical installer: After booting the media, it will follow a process "
"allowing to choose what to install and how to configure your target system. "
@@ -2902,7 +3015,7 @@ msgstr ""
"装类型可以给予您最大限度的灵活性,尤其是选择所需安装的桌面环境。"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:26
+#: en/SelectAndUseISOs2.xml:28
msgid ""
"LIVE media: you can boot the media in a real Mageia system without "
"installing it, to see what you will get after installation. The "
@@ -2912,22 +3025,22 @@ msgstr ""
"样。这种安装的过程更加简单,但您可做的选择也相应减少。"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:35
msgid "Details are given in the next sections."
msgstr "下一节中将涉及有关细节。"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:39
msgid "Media"
msgstr "介质"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:42
msgid "Definition"
msgstr "定义"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:44
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 the ISO "
@@ -2936,7 +3049,7 @@ msgstr ""
"媒介:是一类承载 ISO 文件、可以用于安装和/或更新 Mageia 的任意物理介质。"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:46
+#: en/SelectAndUseISOs2.xml:48
msgid ""
"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
"\">here</link>."
@@ -2945,93 +3058,62 @@ msgstr ""
"到它们。"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:50
+#: en/SelectAndUseISOs2.xml:52
msgid "Classical installation media"
msgstr "传统安装媒介"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:122
-#: en/SelectAndUseISOs2.xml:228
+#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:188
msgid "Common features"
msgstr "通用特性"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:57
+#: en/SelectAndUseISOs2.xml:59
msgid "These ISOs use the traditional installer called drakx."
msgstr "这些 ISO 使用传统的安装器(drakx)。"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:62
+#: en/SelectAndUseISOs2.xml:64
msgid ""
"They are able to make a clean install or an update from previous releases."
msgstr "它们可以用于全新安装,或更新之前的版本。"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:71
msgid "DVD"
msgstr "DVD"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:73
+#: en/SelectAndUseISOs2.xml:75
msgid "Different media for architecture 32 or 64 bits."
msgstr "媒介有 32 位和 64 位两种架构之分。"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:77
+#: en/SelectAndUseISOs2.xml:79
msgid ""
"Some tools are available in the Welcome screen: Rescue System, Memory Test, "
"Hardware Detection Tool."
msgstr "欢迎屏幕中列出了一些可用的工具,如:救援系统、内存测试、硬件检测工具。"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:82
+#: en/SelectAndUseISOs2.xml:84
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:87
+#: en/SelectAndUseISOs2.xml:89
msgid ""
"You'll be given the choice during the installation to add non free software."
msgstr "您可以在安装时添加非自由软件。"
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:94
-msgid "DVD dual arch"
-msgstr "DVD 双架构"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:98
-msgid ""
-"Both architectures are present on the same medium, the choice is made "
-"automatically according to the detected CPU."
-msgstr "同一媒介中包含两种架构。程序将根据检测到的 CPU 类型自动做出选择。"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103
-msgid "Uses Xfce desktop only."
-msgstr "仅使用 Xfce 桌面。"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:107
-msgid ""
-"Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
-"pt, ru, sv, uk) TO BE CHECKED!"
-msgstr ""
-"并非所有语言都有完整支持。(be, bg, ca, de, en, es, fr, it, mk, pl, pt, ru, "
-"sv, uk)请认真核对!"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:112
-msgid "It contains non free software."
-msgstr "其中包含非自由软件。"
-
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:119
+#: en/SelectAndUseISOs2.xml:97
msgid "Live media"
msgstr "Live 媒介"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:126
+#: en/SelectAndUseISOs2.xml:104
msgid ""
"Can be used to preview the distribution without installing it on a HDD, and "
"optionally install Mageia on to your HDD."
@@ -3039,18 +3121,20 @@ msgstr ""
"可以用于预览该发行版,而无需将其安装到硬盘上。也可以用于安装 Mageia 至硬盘。"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:131
-msgid "Each ISO contains only one desktop environment (KDE or GNOME)."
+#: en/SelectAndUseISOs2.xml:109
+#, fuzzy
+msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
msgstr "每个 ISO 仅包含一种桌面环境(KDE 或 GNOME)。"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:136 en/SelectAndUseISOs2.xml:200
-#: en/SelectAndUseISOs2.xml:218 en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
+#: en/SelectAndUseISOs2.xml:208
msgid "Different media for 32 or 64 bit architectures."
msgstr "媒介有 32 位和 64 位两种架构之分。"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:140
+#: en/SelectAndUseISOs2.xml:118
msgid ""
"<emphasis role=\"bold\">Live ISOs can only be used to create clean "
"installations, they cannot be used to upgrade from previous releases.</"
@@ -3060,63 +3144,57 @@ msgstr ""
"级。</emphasis>"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:124
msgid "They contain non free software."
msgstr "其中包含非自由软件。"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:152
-msgid "Live CD KDE"
-msgstr "Live CD KDE"
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "Live DVD Plasma"
+msgstr "Live DVD KDE"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:156 en/SelectAndUseISOs2.xml:192
-msgid "KDE desktop environment only."
+#: en/SelectAndUseISOs2.xml:134
+#, fuzzy
+msgid "Plasma desktop environment only."
msgstr "仅包含 KDE 桌面环境。"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:252
-msgid "English language only."
-msgstr "仅包含英语支持。"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:164 en/SelectAndUseISOs2.xml:182
-msgid "32 bit only."
-msgstr "仅使用 32 位架构。"
+#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
+#: en/SelectAndUseISOs2.xml:174
+msgid "All languages are present."
+msgstr "包含所有语言支持。"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:170
-msgid "Live CD GNOME"
-msgstr "Live CD GNOME"
+#: en/SelectAndUseISOs2.xml:148
+msgid "Live DVD GNOME"
+msgstr "Live DVD GNOME"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:174 en/SelectAndUseISOs2.xml:210
+#: en/SelectAndUseISOs2.xml:152
msgid "GNOME desktop environment only."
msgstr "仅包含 GNOME 桌面环境。"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
-msgid "Live DVD KDE"
+#: en/SelectAndUseISOs2.xml:166
+#, fuzzy
+msgid "Live DVD Xfce"
msgstr "Live DVD KDE"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:196 en/SelectAndUseISOs2.xml:214
-msgid "All languages are present."
-msgstr "包含所有语言支持。"
-
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:206
-msgid "Live DVD GNOME"
-msgstr "Live DVD GNOME"
+#: en/SelectAndUseISOs2.xml:170
+#, fuzzy
+msgid "Xfce desktop environment only."
+msgstr "仅包含 KDE 桌面环境。"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:225
+#: en/SelectAndUseISOs2.xml:185
msgid "Boot-only CD media"
msgstr "仅用于引导的 CD"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:232
+#: en/SelectAndUseISOs2.xml:192
msgid ""
"Each one is a small image that contains no more than that which is needed to "
"start the drakx installer and find drakx-installer-stage2 and other packages "
@@ -3128,7 +3206,7 @@ msgstr ""
"络或互联网。"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:201
msgid ""
"These media are very light (less than 100 MB) and are convenient when "
"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
@@ -3137,42 +3215,49 @@ msgstr ""
"这类媒介非常小巧(小于 100 MB),适用于不方便下载完整版 DVD、没有 DVD 驱动器"
"或不支持 USB 引导的电脑。"
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:212
+msgid "English language only."
+msgstr "仅包含英语支持。"
+
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:258
-msgid "boot.iso"
-msgstr "boot.iso"
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
+msgid "netinstall.iso"
+msgstr "启动安装"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:262
+#: en/SelectAndUseISOs2.xml:222
msgid ""
"Contains only free software, for those people who refuse to use non-free "
"software."
msgstr "仅包含自由软件,适用于不希望使用非自由软件的人。"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:269
-msgid "boot-nonfree.iso"
+#: en/SelectAndUseISOs2.xml:229
+#, fuzzy
+msgid "netinstall-nonfree.iso"
msgstr "boot-nonfree.iso"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:233
msgid ""
"Contains non-free software (mostly drivers, codecs...) for people who need "
"it."
msgstr "包含部分用户所需的非自由软件(主要为驱动、编码器)。"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:282
+#: en/SelectAndUseISOs2.xml:242
msgid "Downloading and Checking Media"
msgstr "下载和检查媒介"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:245
msgid "Downloading"
msgstr "下载中"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:287
+#: en/SelectAndUseISOs2.xml:247
msgid ""
"Once you have chosen your ISO file, you can download it using either http or "
"BitTorrent. In both cases, a window gives you some information, such as the "
@@ -3184,12 +3269,12 @@ msgstr ""
"载,您可能会看到类似下列情形"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:294
+#: en/SelectAndUseISOs2.xml:254
msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:299
+#: en/SelectAndUseISOs2.xml:259
msgid ""
"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
@@ -3199,22 +3284,22 @@ msgstr ""
"保留它们以便<link linkend=\"integrity\">后续使用</link>。之后,窗口将会显示:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
+#: en/SelectAndUseISOs2.xml:264
msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:309
+#: en/SelectAndUseISOs2.xml:269
msgid "Check the radio button Save File."
msgstr "点击“保存文件”选项。"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:313
+#: en/SelectAndUseISOs2.xml:273
msgid "Checking the downloaded media integrity"
msgstr "检查下载文件的完整性"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:316
+#: en/SelectAndUseISOs2.xml:276
msgid ""
"Both checksums are hexadecimal numbers calculated by an algorithm from the "
"file to be downloaded. When you ask these algorithms to recalculate this "
@@ -3227,12 +3312,12 @@ msgstr ""
"下载失败(文件可能不完整或已损坏),您应当重新下载。"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:283
msgid "Open a console, no need to be root, and:"
msgstr "打开一个终端(无需以 root 身份操作),然后:"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:325
+#: en/SelectAndUseISOs2.xml:285
msgid ""
"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
"file.iso</userinput>."
@@ -3241,7 +3326,7 @@ msgstr ""
"image/file.iso</userinput>。"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:328
+#: en/SelectAndUseISOs2.xml:288
msgid ""
"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
"image/file.iso</userinput>."
@@ -3250,7 +3335,7 @@ msgstr ""
"image/file.iso</userinput>。"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:331
+#: en/SelectAndUseISOs2.xml:291
msgid ""
"and compare the obtained number on your computer (you may have to wait for a "
"while) with the number given by Mageia. Example:"
@@ -3258,17 +3343,17 @@ msgstr ""
"然后比较执行结果(可能需要等待一段时间)和 Mageia 网上提供的数值。例如:"
#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:335
+#: en/SelectAndUseISOs2.xml:295
msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:345
+#: en/SelectAndUseISOs2.xml:305
msgid "Burn or dump the ISO"
msgstr "刻录或转储 ISO"
#. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:347
+#: en/SelectAndUseISOs2.xml:307
msgid ""
"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
"These operations are not a simple copy and aim to make a boot-able medium."
@@ -3277,12 +3362,12 @@ msgstr ""
"制,其目的是创建一个可引导的媒体。"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:352
+#: en/SelectAndUseISOs2.xml:312
msgid "Burning the ISO to a CD/DVD"
msgstr "将ISO文件刻录到CD或DVD"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:314
msgid ""
"Use whatever burner you wish but ensure the burning device is set correctly "
"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
@@ -3294,12 +3379,12 @@ msgstr ""
"\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images\">Mageia wiki</link>。"
#. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:321
msgid "Dump the ISO to a USB stick"
msgstr "写入 ISO 到 U 盘"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:363
+#: en/SelectAndUseISOs2.xml:323
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."
@@ -3308,7 +3393,7 @@ msgstr ""
"U 盘来引导和安装系统。"
#. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:367
+#: en/SelectAndUseISOs2.xml:327
msgid ""
"\"dumping\" an image onto a flash device destroys any previous file-system "
"on the device; any other data will be lost and the partition capacity will "
@@ -3318,19 +3403,19 @@ msgstr ""
"容量将会(暂时)缩减为镜像大小。"
#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:372
+#: en/SelectAndUseISOs2.xml:332
msgid ""
"To recover the original capacity, you must redo partitioning and re-format "
"the USB stick."
msgstr "若要恢复原始容量,您必须重新进行分区和格式化操作。"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:376
+#: en/SelectAndUseISOs2.xml:336
msgid "Using a graphical tool within Mageia"
msgstr "使用 Mageia 的图形化工具"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:378
+#: en/SelectAndUseISOs2.xml:338
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>"
@@ -3340,17 +3425,17 @@ msgstr ""
"具来操作。"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:382
+#: en/SelectAndUseISOs2.xml:342
msgid "Using a graphical tool within Windows"
msgstr "使用 Windows 下的图形化工具"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:384
+#: en/SelectAndUseISOs2.xml:344
msgid "You could try:"
msgstr "您可以尝试:"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:346
msgid ""
"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
"the \"ISO image\" option;"
@@ -3359,7 +3444,7 @@ msgstr ""
"的“ISO 镜像”选项;"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:349
msgid ""
"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
"Disk Imager</link>"
@@ -3368,12 +3453,12 @@ msgstr ""
"Disk Imager</link>"
#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:354
msgid "Using Command line within a GNU/Linux system"
msgstr "使用 GNU/Linux 系统中的命令行程序"
#. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:397
+#: en/SelectAndUseISOs2.xml:357
msgid ""
"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
"disc partition if you get the device-ID wrong."
@@ -3382,17 +3467,17 @@ msgstr ""
"据。"
#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:401
+#: en/SelectAndUseISOs2.xml:361
msgid "You can also use the dd tool in a console:"
msgstr "您也可以在终端中使用 dd 工具:"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:405
+#: en/SelectAndUseISOs2.xml:365
msgid "Open a console"
msgstr "打开一个终端"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:409
+#: en/SelectAndUseISOs2.xml:369
msgid ""
"Become root with the command <userinput>su -</userinput> (don't forget the "
"final '-' )"
@@ -3400,29 +3485,29 @@ msgstr ""
"使用命令 <userinput>su -</userinput> 获取 root 权限(不要漏掉末尾的“-”)"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:413
+#: en/SelectAndUseISOs2.xml:373
msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:420
+#: en/SelectAndUseISOs2.xml:380
msgid ""
"Plug your USB stick (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:426
+#: en/SelectAndUseISOs2.xml:386
msgid "Enter the command <userinput>fdisk -l</userinput>"
msgstr "输入命令 <userinput>fdisk -l</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:429
+#: en/SelectAndUseISOs2.xml:389
msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:434
+#: en/SelectAndUseISOs2.xml:394
msgid ""
"Alternatively, you can get the device name with the command <code>dmesg</"
"code>: at end, you see the device name starting with <emphasis>sd</"
@@ -3432,7 +3517,7 @@ msgstr ""
"以 <emphasis>sd</emphasis> 开头的设备名,如 <emphasis>sdd</emphasis>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:439
+#: en/SelectAndUseISOs2.xml:399
#, no-wrap
msgid ""
"[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3474,7 +3559,7 @@ 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:460
+#: en/SelectAndUseISOs2.xml:420
msgid ""
"Find the device name for your USB stick (by its size), for example <code>/"
"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
@@ -3483,7 +3568,7 @@ msgstr ""
"一个 8GB 的 U 盘。"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:466
+#: en/SelectAndUseISOs2.xml:426
msgid ""
"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
"bs=1M</userinput>"
@@ -3491,12 +3576,12 @@ msgstr ""
"输入命令:# <userinput>dd if=ISO文件的完整路径 of=/dev/sdX bs=1M</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:469
+#: en/SelectAndUseISOs2.xml:429
msgid "Where X=your device name eg: /dev/sdc"
msgstr "其中,“X”是您的设备名(如:/dev/sdc)"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:471
+#: en/SelectAndUseISOs2.xml:431
msgid ""
"Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
"dev/sdb bs=1M</userinput>"
@@ -3505,37 +3590,37 @@ msgstr ""
"dev/sdb bs=1M</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:477
+#: en/SelectAndUseISOs2.xml:437
msgid "Enter the command: # <userinput>sync</userinput>"
msgstr "输入命令:# <userinput>sync</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:481
+#: en/SelectAndUseISOs2.xml:441
msgid "Unplug your USB stick, it is done"
msgstr "操作完成,拔下 U 盘"
#. type: Content of: <section><info><title>
-#: en/selectCountry.xml:13
+#: en/selectCountry.xml:3
msgid "Select your Country / Region"
msgstr "选择您所在的国家/地区"
-#. 2012-12-25 marja - moved this section out of misc-params
-#. 2013-05-05 marja - added screenshot
+#. Lebarhon 2016 12 16 updated for Mageia 6
#. type: Content of: <section><mediaobject>
-#: en/selectCountry.xml:21
+#: en/selectCountry.xml:9
+#, fuzzy
msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
#. type: Content of: <section><para>
-#: en/selectCountry.xml:27
+#: en/selectCountry.xml:14
+#, 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."
msgstr ""
@@ -3543,7 +3628,7 @@ msgstr ""
"错误的国家,您可能无法正常使用无线网络。"
#. type: Content of: <section><para>
-#: en/selectCountry.xml:32
+#: en/selectCountry.xml:19
msgid ""
"If your country isn't in the list, click the <guilabel>Other Countries</"
"guilabel> button and choose your country / region there."
@@ -3552,7 +3637,7 @@ msgstr ""
"国家/区域。"
#. type: Content of: <section><note><para>
-#: en/selectCountry.xml:37
+#: en/selectCountry.xml:24
msgid ""
"If your country is only in the <guilabel>Other Countries</guilabel> list, "
"after clicking <guibutton>OK</guibutton> it may seem a country from the "
@@ -3563,21 +3648,20 @@ msgstr ""
"定</guibutton> 按钮之后,请忽略前一个列表中的选项。DrakX 会应用您后来的选择。"
#. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:46
+#: en/selectCountry.xml:32
msgid "Input method"
msgstr "输入法"
#. type: Content of: <section><section><para>
-#: en/selectCountry.xml:49
+#: en/selectCountry.xml:35
+#, fuzzy
msgid ""
"In the <guilabel>Other Countries</guilabel> 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 in Mageia DVDs, Africa/India and Asia/no-India Live-"
-"CDs. For Asian and African locales, IBus will be set as default input method "
-"so users should not need to configure it manually. Other input methods(SCIM, "
-"GCIN, HIME, etc) also provide similar functions and can be installed if you "
-"added HTTP/FTP media before package selection."
+"default input method, so users should not need to configure it manually. "
+"Other input methods(SCIM, GCIN, HIME, etc) also provide similar functions "
+"and can be installed if you added HTTP/FTP media before package selection."
msgstr ""
"在 <guilabel>其他国家</guilabel> 窗口中,您也可以选择一种输入法(位于列表底"
"部)。输入法用于输入各类语言中的字符(中文、日文、韩文等)。IBus 是 Mageia "
@@ -3587,10 +3671,11 @@ msgstr ""
"来安装它们。"
#. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:61
+#: en/selectCountry.xml:44
+#, fuzzy
msgid ""
"If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -&gt; "
+"after you boot your installed system via \"Configure your Computer\" -> "
"\"System\", or by running localedrake as root."
msgstr ""
"若您在安装期间缺少输入法,您可以在安装完成后通过“配置我的电脑”-&gt;“系统”设置"
@@ -3896,323 +3981,383 @@ msgstr ""
"过五键的鼠标。"
#. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:5
+#: en/setupBootloaderAddEntry.xml:7
msgid "Add or Modify a Boot Menu Entry"
msgstr "添加或修改引导菜单项"
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:10
+#. type: Content of: <section><para>
+#: en/setupBootloaderAddEntry.xml:11
msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
-"align=\"center\" revision=\"1\"/> </imageobject> <imageobject condition="
-"\"live\"> <imagedata format=\"PNG\" xml:id=\"bootloaderConfiguration-im1\" "
-"fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
-"> </imageobject>"
+"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
+"software grub-customizer instead (Available in the Mageia repositories)."
msgstr ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
-"align=\"center\" revision=\"1\"/> </imageobject> <imageobject condition="
-"\"live\"> <imagedata format=\"PNG\" xml:id=\"bootloaderConfiguration-im1\" "
-"fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
-"> </imageobject>"
+
+#. type: Content of: <section><note><para>
+#: en/setupBootloaderAddEntry.xml:16
+#, fuzzy
+msgid ""
+"For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
+"en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
+"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>。"
+
+#. type: Content of: <section><info><title>
+#: en/setupBootloader.xml:9
+msgid "Bootloader main options"
+msgstr "引导程序的主要选项"
#. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
-msgid "With a Bios system"
-msgstr "使用 BIOS 系统"
+#: en/setupBootloader.xml:13
+#, fuzzy
+msgid "Bootloader interface"
+msgstr "引导程序的主要选项"
#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:21
+#: en/setupBootloader.xml:15
+msgid "By default, Mageia uses exclusively:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:19
msgid ""
-"You can add an entry or modify the one you select first, by pressing the "
-"relevant button in the <emphasis>Bootloader Configuration</emphasis> screen "
-"and editing the screen that pops up on top of it."
+"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
msgstr ""
-"您可以添加项,或者修改您已选中的项,方法是在<emphasis>引导器配置</emphasis>界"
-"面按下相应键,并在弹出的编辑界面中进行操作。"
-#. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:26
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:24
+#, fuzzy
+msgid "Grub2-efi for a UEFI system."
+msgstr "使用 UEFI 系统"
+
+#. type: Content of: <section><section><tip><para>
+#: en/setupBootloader.xml:29
+msgid "The Mageia graphical menus are nice :"
+msgstr "Mageia 的图形化菜单:"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:33
+msgid "Grub2 on Legacy/MBR and Legacy/GPT systems"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:36
+#, fuzzy
msgid ""
-"If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
-"this tool to edit entries at this step, press 'Next'. You need to manually "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
msgstr ""
-"若您选择了 <code>Grub 2</code> 作为引导器,您将无法在这里使用工具编辑引导项,"
-"请点击“下一步”继续。您需要之后手动编辑 <code>/boot/grub2/custom.cfg</code> 或"
-"使用 <code>grub-customizer</code> 来编辑。"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:33
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:42
+#, fuzzy
msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"setupBootloader.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:38
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
+msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+msgstr "若您不确定如何操作,请不要修改“引导设备”。"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:52
+#, fuzzy
+msgid "Grub2-efi on UEFI systems"
+msgstr "使用 UEFI 系统"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:54
+#, fuzzy
msgid ""
-"Some things that can be done without any risk, are changing the label of an "
-"entry and ticking the box to make an entry the default one."
-msgstr "部分操作,例如改变引导项标题,或设置默认选项,是没有风险的。"
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose between with or without graphical menu"
+msgstr ""
+"对于 UEFI,用户界面会稍有不同,您将无法选择引导器(因为只能使用 Grub2-efi)。"
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:58
msgid ""
-"You can add the proper version number of an entry, or rename it completely."
-msgstr "您可以为某一项添加版本号,或者完全删除它。"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:45
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:64
+#, fuzzy
msgid ""
-"The default entry is the one the systems boots into if you don't make a "
-"choice while booting up."
-msgstr "若您在引导时未进行选择,则会进入默认引导项对应的系统。"
+"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
-#. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:69
+#, fuzzy
msgid ""
-"Editing other things can leave you with an unbootable system. Please don't "
-"just try something without knowing what you are doing."
-msgstr "编辑其他内容可能导致系统无法引导。请不要在不了解的情况下进行修改。"
+"If Mageia is the first system installed on your computer, the installer "
+"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"If there was already UEFI operating systems previously installed on your "
+"computer (Windows 8 for example), the Mageia installer detected the existing "
+"ESP created by Windows and adds grub2-efi. Although it is possible to have "
+"several ESPs, only one is advised and enough whatever the number of "
+"operating systems you have."
+msgstr ""
+"如果 Mageia 是您在电脑上安装的第一个系统,安装程序将自动创建一个 ESP(EFI 系"
+"统分区)来容纳引导器(Grub2-efi)。如果已安装了其他 UEFI 操作系统(例如 "
+"Windows 8),Mageia 安装器将会探测现存的(由 Windows 创建的) ESP,并添加 "
+"grub2-efi。尽管多个 ESP 可以共存,但只需一个 ESP 即可满足启动所有操作系统的需"
+"求。"
#. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
-msgid "With an UEFI system"
-msgstr "使用 UEFI 系统"
+#: en/setupBootloader.xml:84
+msgid "Using a Mageia bootloader"
+msgstr "使用 Mageia 提供的引导器"
#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:58
+#: en/setupBootloader.xml:86
+msgid "By default, according to your system, Mageia writes a new:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:90
msgid ""
-"In this case you are using Grub2-efi and you cannot use this tool to edit "
-"entries at this step. To do that you need to manually edit <code>/boot/grub2/"
-"custom.cfg</code> or use <code>grub-customizer</code> instead. All you can "
-"do here, is to choose the default entry in the drop down list."
+"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
+"drive or in the BIOS boot partition."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:95
+msgid "Grub2-efi bootloader into the ESP"
msgstr ""
-"这种情况下,您将使用 Grub2-efi 进行引导,并且无法在这里使用工具进行编辑。您需"
-"要在安装后手动修改 <code>/boot/grub2/custom.cfg</code>,或使用 <code>grub-"
-"customizer</code> 来进行编辑。此处您只能选择默认引导项。"
#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:64
+#: en/setupBootloader.xml:99
msgid ""
-"After a click on the <guibutton>Next</guibutton> button, another drop down "
-"list allows to choose the video resolution for Grub2 which is a graphical "
-"boot loader."
+"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 uncheck the box "
+"<guilabel>Probe Foreign OS</guilabel>"
msgstr ""
-"在点击 <guibutton>下一步</guibutton> 按钮之后,您将会看到另一个下拉列表,可以"
-"用它来选择 GRUB2 引导器的屏幕分辨率。"
#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:69
+#: en/setupBootloader.xml:105
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
"imageobject>"
-#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "引导程序的主要选项"
-
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloader.xml:11
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:111
+#, fuzzy
msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+"imageobject>"
msgstr ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:118
+msgid "Using an existing bootloader"
+msgstr "使用现存的引导器"
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:22
+#: en/setupBootloader.xml:120
msgid ""
-"If you prefer different bootloader settings to those chosen automatically by "
-"the installer, you can change them here."
-msgstr "若您希望修改安装程序默认选择的引导器设置,可以在这里进行更改。"
+"The exact procedure for adding your Mageia system to an existing bootloader "
+"is beyond the scope of this help, 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:128
+msgid "Using the chain loading"
+msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:130
msgid ""
-"You may already have another operating system on your machine, in which case "
-"you need to decide whether to add Mageia to your existing bootloader, or "
-"allow Mageia to create a new one."
+"If you don't want a bootable Mageia, but chain load it from another OS, "
+"click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
+"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
msgstr ""
-"您可能同时在电脑上安装了其他系统,这种情况下您需要将 Mageia 添加到现存引导"
-"器,或让 Mageia 创建一个新的起动器。"
-
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:32
-msgid "The Mageia graphical menus are nice :"
-msgstr "Mageia 的图形化菜单:"
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:37
-msgid "Using a Mageia bootloader"
-msgstr "使用 Mageia 提供的引导器"
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:136
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:41
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:142
+#, fuzzy
msgid ""
-"By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
-"(Master Boot Record) of your first hard drive. If you already have other "
-"operating systems installed, Mageia attempts to add them to your new Mageia "
-"boot menu."
+"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+"imageobject>"
msgstr ""
-"默认情况下将新的 GRUB(传统版)引导器写入到第一硬盘驱动器的 MBR(主引导记录)"
-"中。如果您已经安装了其他系统,Mageia 会尝试将其添加到新的引导菜单中。"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47
+#. type: Content of: <section><section><para>
+#: en/setupBootloader.xml:147
msgid ""
-"Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
-"legacy and Lilo."
-msgstr "除了 GRUB 传统版和 Lilo,Mageia 目前也提供 GRUB2 作为可选的引导器,"
+"You will get a warning that the bootloader will lack, ignore it by a click "
+"on <guibutton>OK</guibutton>."
+msgstr ""
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:51
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:151
+#, fuzzy
msgid ""
-"Linux systems which use the GRUB2 bootloader are not currently supported by "
-"GRUB (legacy) and will not be recognized if the default GRUB bootloader is "
-"used."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:158
+msgid "Options"
msgstr ""
-"当前,GRUB(传统版,默认选项)无法识别和支持使用 GRUB2 作为引导器的 Linux 系"
-"统。"
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:56
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:161
+msgid "First page"
+msgstr ""
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:165
msgid ""
-"The best solution here is to use the GRUB2 bootloader which is available at "
-"the Summary page during installation."
+"<guilabel>Delay before booting the default image</guilabel>: This text box "
+"lets you set a delay in seconds before the default operating system is "
+"started up."
msgstr ""
-"最好的解决方法是使用 GRUB 2 引导器,可以在安装过程中的摘要页面中选择安装。"
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:64
-msgid "Using an existing bootloader"
-msgstr "使用现存的引导器"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:171
+msgid ""
+"<guilabel>Security</guilabel>: This allows you to set a password for the "
+"bootloader. This means other people can not enter single user mode or change "
+"settings at the boot time."
+msgstr ""
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:68
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:177
msgid ""
-"If you decide to use an existing bootloader then you will need to remember "
-"to STOP at the summary page during the installation and click the Bootloader "
-"<guibutton>Configure</guibutton> button, which will allow you to change the "
-"bootloader install location."
+"<guilabel>Password</guilabel>: This text box is where you actually put the "
+"password"
msgstr ""
-"若您要使用现存的引导器,请记得在安装过程中的摘要页面处停留,然后点击引导器 "
-"<guibutton>配置</guibutton> 按钮,并改变引导器的安装位置。"
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:182
+#, fuzzy
msgid ""
-"Do not select a device e.g.\"sda\", or you will overwrite your existing MBR. "
-"You must select the root partition that you chose during the partitioning "
-"phase earlier, e.g. sda7."
+"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
+"check that it matches with the one set above."
msgstr ""
-"请不要选择类似“sda”的设备,否则会覆盖现存的 MBR。您必须选择根分区(在之前的分"
-"区操作中设置)作为安装对象"
+"<guilabel>密码(重复)</guilabel>:再输入依次用户密码。drakx 将会检查两次输入"
+"的密码是否一致。"
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:79
-msgid "To be clear, sda is a device, sda7 is a partition on that device."
-msgstr "要清楚,sda 代表一个设备(磁盘),sda7 代表设备上的分区。"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#, fuzzy
+msgid "<guilabel>Advanced</guilabel>"
+msgstr "<guilabel>服务</guilabel>:"
-#. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:83
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:192
msgid ""
-"Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
-"your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
-"the installer screen."
+"<guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power "
+"Interface) is a standard for the power management. It can save energy by "
+"stopping unused devices, this was the method used before APM. Uncheck it be "
+"useful, for example, if 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 ""
-"可以按下 Ctrl+Alt+F2 来转到 tty2,然后输入 <literal>df</literal> 来查看 "
-"<literal>/</literal>(根分区)对应的分区编号。然后按下 Ctrl+Alt+F7 返回安装界"
-"面。"
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:89
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:202
msgid ""
-"The exact procedure for adding your Mageia system to an existing bootloader "
-"is beyond the scope of this help, 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."
+"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"multiprocessing for multi core processors."
msgstr ""
-"有关添加 Mageia 系统至现存引导器的问题超出了此帮助的范围。多数情况下,这设计"
-"到运行相应的引导器安装程序,并自动检测和添加引导项。请参见有关操作系统的文档"
-"以便进一步操作。"
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:99
-msgid "Bootloader advanced option"
-msgstr "引导器高级选项"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:208
+msgid ""
+"<guilabel>Enable APIC</guilabel>: Enabling or disabling 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 ""
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:103
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:216
msgid ""
-"If you have very limited disk space for the <literal>/</literal> partition "
-"that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
-"guibutton> and check the box for <guilabel>Clean /tmp at each boot</"
-"guilabel>. This helps to maintain some free space."
+"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
+"manage all external interrupts for some specific processor in an SMP system."
msgstr ""
-"如果您的 <literal>/</literal> 分区对于 <literal>/tmp</literal> 来说太小,请点"
-"击 <guibutton>Advanced</guibutton>,然后勾选 <guilabel>每次启动时清理 /tmp</"
-"guilabel>。这有助于维持一定的空闲空间。"
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:114
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:226
+msgid "Next page"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:230
+msgid "<guilabel>Default:</guilabel> Operating system started up by default"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:235
msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose the boot loader since only Grub2-efi is available."
+"<guilabel>Append:</guilabel> This option lets you pass the kernel "
+"information or tell the kernel to give you more information as it boots."
msgstr ""
-"对于 UEFI,用户界面会稍有不同,您将无法选择引导器(因为只能使用 Grub2-efi)。"
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:118
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:241
msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
+"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:126
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:247
msgid ""
-"If Mageia is the first system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
-"If there was already UEFI operating systems previously installed on your "
-"computer (Windows 8 for example), the Mageia installer detected the existing "
-"ESP created by Windows and added grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
-"operating systems you have."
+"<guilabel>Video mode:</guilabel> This sets the screen size and colour depth "
+"the boot menu will use. If you click the down triangle you will be offered "
+"other size and colour depth options."
msgstr ""
-"如果 Mageia 是您在电脑上安装的第一个系统,安装程序将自动创建一个 ESP(EFI 系"
-"统分区)来容纳引导器(Grub2-efi)。如果已安装了其他 UEFI 操作系统(例如 "
-"Windows 8),Mageia 安装器将会探测现存的(由 Windows 创建的) ESP,并添加 "
-"grub2-efi。尽管多个 ESP 可以共存,但只需一个 ESP 即可满足启动所有操作系统的需"
-"求。"
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:134
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
-msgstr "若您不确定如何操作,请不要修改“引导设备”。"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:254
+msgid ""
+"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
+"linkend=\"setupChainLoading\">Using the chain loading</link>"
+msgstr ""
#. type: Content of: <section><info><title>
#: en/setupSCSI.xml:11
@@ -4259,22 +4404,23 @@ msgid "DrakX should then be able to configure the drive(s) correctly."
msgstr "随后 DrakX 应当能正确配置这些驱动器。"
#. type: Content of: <section><info><title>
-#: en/soundConfig.xml:11
+#: en/soundConfig.xml:3
msgid "Sound Configuration"
msgstr "声音配置"
-#. Started by marja on 2013-12-07
+#. Lebarhon 20170209 updated SC
#. type: Content of: <section><mediaobject>
-#: en/soundConfig.xml:17
+#: en/soundConfig.xml:9
+#, fuzzy
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
-"format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
msgstr ""
"<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
"format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
#. type: Content of: <section><para>
-#: en/soundConfig.xml:23
+#: en/soundConfig.xml:14
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 we have a default "
@@ -4283,7 +4429,7 @@ msgstr ""
"这一界面中列出了安装程序为声卡选定的驱动,如果有默认驱动则将其作为默认配置。"
#. type: Content of: <section><para>
-#: en/soundConfig.xml:27
+#: en/soundConfig.xml:18
msgid ""
"The default driver should work without problems. However, if after install "
"you do encounter problems, then run <command>draksound</command> or start "
@@ -4296,7 +4442,7 @@ msgstr ""
"guilabel>选项卡中的<guilabel>声音配置</guilabel>来启动 draksound。"
#. type: Content of: <section><para>
-#: en/soundConfig.xml:33
+#: en/soundConfig.xml:24
msgid ""
"Then, in the draksound or \"Sound Configuration\" tool screen, click on "
"<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
@@ -4306,12 +4452,12 @@ msgstr ""
"<guibutton>故障排除</guibutton>来查看解决问题的建议。"
#. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:41
+#: en/soundConfig.xml:31
msgid "Advanced"
msgstr "高级"
#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:44
+#: en/soundConfig.xml:34
msgid ""
"Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
"useful if there is no default driver and there are several drivers "
@@ -4321,7 +4467,7 @@ msgstr ""
"<guibutton>Advanced</guibutton>来更正。"
#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:49
+#: en/soundConfig.xml:39
msgid ""
"In that case you can select a different driver after clicking on "
"<guibutton>Let me pick any driver</guibutton>."
@@ -4485,12 +4631,12 @@ msgid "Uninstalling Mageia"
msgstr "卸载Mageia"
#. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:10
msgid "Howto"
msgstr "如何做"
#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:11
+#: en/uninstall-Mageia.xml:12
msgid ""
"If Mageia didn't convince you or you can't install it correctly, in short "
"you want get rid of it. That is your right and Mageia also gives you the "
@@ -4500,7 +4646,7 @@ msgstr ""
"一功能可不是所有操作系统都会提供的!"
#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:17
msgid ""
"After your data backup, reboot your installation Mageia DVD and select "
"Rescue system, then, Restore Windows boot loader. At the next boot, you will "
@@ -4511,7 +4657,7 @@ msgstr ""
"Windows 系统。"
#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:20
+#: en/uninstall-Mageia.xml:22
msgid ""
"To recover the space used by Mageia partitions on Windows, click on "
"<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
@@ -4528,7 +4674,7 @@ msgstr ""
"空间。"
#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:28
+#: en/uninstall-Mageia.xml:30
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."
@@ -4537,7 +4683,7 @@ msgstr ""
"NTFS),系统将自动为其分配一个盘符。"
#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:31
+#: en/uninstall-Mageia.xml:33
msgid ""
"If you have Vista or 7, you have one more possibility, you can extend the "
"existing partition that is at the left of the freed space. There are other "
@@ -4593,6 +4739,278 @@ msgstr ""
"间,这是正常现象。"
#~ msgid ""
+#~ "However, while using your new install, any user you add in <emphasis>MCC "
+#~ "- System - Manage users on system</emphasis> will have a home directory "
+#~ "that is both read and write protected."
+#~ msgstr ""
+#~ "不过,在使用系统时,通过 <emphasis>Mageia 控制中心 - 系统 -管理系统用户</"
+#~ "emphasis>添加的用户将拥有其他用户不可读且不可写的主目录。"
+
+#~ msgid ""
+#~ "If you don't want a world readable home directory for anyone, it is "
+#~ "advised to only add a temporary user now and to add the real one(s) "
+#~ "after reboot."
+#~ msgstr ""
+#~ "若您不希望为任何人创建全局可读的主目录,则现在最好只添加一个临时用户,然后"
+#~ "在重启后添加您所需要的用户。"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+
+#~ msgid "DVD dual arch"
+#~ msgstr "DVD 双架构"
+
+#~ msgid ""
+#~ "Both architectures are present on the same medium, the choice is made "
+#~ "automatically according to the detected CPU."
+#~ msgstr "同一媒介中包含两种架构。程序将根据检测到的 CPU 类型自动做出选择。"
+
+#~ msgid "Uses Xfce desktop only."
+#~ msgstr "仅使用 Xfce 桌面。"
+
+#~ msgid ""
+#~ "Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
+#~ "pt, ru, sv, uk) TO BE CHECKED!"
+#~ msgstr ""
+#~ "并非所有语言都有完整支持。(be, bg, ca, de, en, es, fr, it, mk, pl, pt, "
+#~ "ru, sv, uk)请认真核对!"
+
+#~ msgid "It contains non free software."
+#~ msgstr "其中包含非自由软件。"
+
+#~ msgid "Live CD KDE"
+#~ msgstr "Live CD KDE"
+
+#~ msgid "32 bit only."
+#~ msgstr "仅使用 32 位架构。"
+
+#~ msgid "Live CD GNOME"
+#~ msgstr "Live CD GNOME"
+
+#~ msgid "boot.iso"
+#~ msgstr "boot.iso"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
+#~ "</imageobject>"
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png"
+#~ "\" align=\"center\" revision=\"1\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\" fileref=\"live-bootloaderConfiguration.png"
+#~ "\" align=\"center\" revision=\"1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png"
+#~ "\" align=\"center\" revision=\"1\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\" fileref=\"live-bootloaderConfiguration.png"
+#~ "\" align=\"center\" revision=\"1\"/> </imageobject>"
+
+#~ msgid "With a Bios system"
+#~ msgstr "使用 BIOS 系统"
+
+#~ msgid ""
+#~ "You can add an entry or modify the one you select first, by pressing the "
+#~ "relevant button in the <emphasis>Bootloader Configuration</emphasis> "
+#~ "screen and editing the screen that pops up on top of it."
+#~ msgstr ""
+#~ "您可以添加项,或者修改您已选中的项,方法是在<emphasis>引导器配置</"
+#~ "emphasis>界面按下相应键,并在弹出的编辑界面中进行操作。"
+
+#~ msgid ""
+#~ "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
+#~ "this tool to edit entries at this step, press 'Next'. You need to "
+#~ "manually edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-"
+#~ "customizer</code> instead."
+#~ msgstr ""
+#~ "若您选择了 <code>Grub 2</code> 作为引导器,您将无法在这里使用工具编辑引导"
+#~ "项,请点击“下一步”继续。您需要之后手动编辑 <code>/boot/grub2/custom.cfg</"
+#~ "code> 或使用 <code>grub-customizer</code> 来编辑。"
+
+#~ msgid ""
+#~ "Some things that can be done without any risk, are changing the label of "
+#~ "an entry and ticking the box to make an entry the default one."
+#~ msgstr "部分操作,例如改变引导项标题,或设置默认选项,是没有风险的。"
+
+#~ msgid ""
+#~ "You can add the proper version number of an entry, or rename it "
+#~ "completely."
+#~ msgstr "您可以为某一项添加版本号,或者完全删除它。"
+
+#~ msgid ""
+#~ "The default entry is the one the systems boots into if you don't make a "
+#~ "choice while booting up."
+#~ msgstr "若您在引导时未进行选择,则会进入默认引导项对应的系统。"
+
+#~ msgid ""
+#~ "Editing other things can leave you with an unbootable system. Please "
+#~ "don't just try something without knowing what you are doing."
+#~ msgstr "编辑其他内容可能导致系统无法引导。请不要在不了解的情况下进行修改。"
+
+#~ msgid ""
+#~ "In this case you are using Grub2-efi and you cannot use this tool to edit "
+#~ "entries at this step. To do that you need to manually edit <code>/boot/"
+#~ "grub2/custom.cfg</code> or use <code>grub-customizer</code> instead. All "
+#~ "you can do here, is to choose the default entry in the drop down list."
+#~ msgstr ""
+#~ "这种情况下,您将使用 Grub2-efi 进行引导,并且无法在这里使用工具进行编辑。"
+#~ "您需要在安装后手动修改 <code>/boot/grub2/custom.cfg</code>,或使用 "
+#~ "<code>grub-customizer</code> 来进行编辑。此处您只能选择默认引导项。"
+
+#~ msgid ""
+#~ "After a click on the <guibutton>Next</guibutton> button, another drop "
+#~ "down list allows to choose the video resolution for Grub2 which is a "
+#~ "graphical boot loader."
+#~ msgstr ""
+#~ "在点击 <guibutton>下一步</guibutton> 按钮之后,您将会看到另一个下拉列表,"
+#~ "可以用它来选择 GRUB2 引导器的屏幕分辨率。"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "If you prefer different bootloader settings to those chosen automatically "
+#~ "by the installer, you can change them here."
+#~ msgstr "若您希望修改安装程序默认选择的引导器设置,可以在这里进行更改。"
+
+#~ msgid ""
+#~ "You may already have another operating system on your machine, in which "
+#~ "case you need to decide whether to add Mageia to your existing "
+#~ "bootloader, or allow Mageia to create a new one."
+#~ msgstr ""
+#~ "您可能同时在电脑上安装了其他系统,这种情况下您需要将 Mageia 添加到现存引导"
+#~ "器,或让 Mageia 创建一个新的起动器。"
+
+#~ msgid ""
+#~ "By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
+#~ "(Master Boot Record) of your first hard drive. If you already have other "
+#~ "operating systems installed, Mageia attempts to add them to your new "
+#~ "Mageia boot menu."
+#~ msgstr ""
+#~ "默认情况下将新的 GRUB(传统版)引导器写入到第一硬盘驱动器的 MBR(主引导记"
+#~ "录)中。如果您已经安装了其他系统,Mageia 会尝试将其添加到新的引导菜单中。"
+
+#~ msgid ""
+#~ "Mageia now also offers GRUB2 as an optional bootloader in addition to "
+#~ "GRUB legacy and Lilo."
+#~ msgstr "除了 GRUB 传统版和 Lilo,Mageia 目前也提供 GRUB2 作为可选的引导器,"
+
+#~ msgid ""
+#~ "Linux systems which use the GRUB2 bootloader are not currently supported "
+#~ "by GRUB (legacy) and will not be recognized if the default GRUB "
+#~ "bootloader is used."
+#~ msgstr ""
+#~ "当前,GRUB(传统版,默认选项)无法识别和支持使用 GRUB2 作为引导器的 Linux "
+#~ "系统。"
+
+#~ msgid ""
+#~ "The best solution here is to use the GRUB2 bootloader which is available "
+#~ "at the Summary page during installation."
+#~ msgstr ""
+#~ "最好的解决方法是使用 GRUB 2 引导器,可以在安装过程中的摘要页面中选择安装。"
+
+#~ msgid ""
+#~ "If you decide to use an existing bootloader then you will need to "
+#~ "remember to STOP at the summary page during the installation and click "
+#~ "the Bootloader <guibutton>Configure</guibutton> button, which will allow "
+#~ "you to change the bootloader install location."
+#~ msgstr ""
+#~ "若您要使用现存的引导器,请记得在安装过程中的摘要页面处停留,然后点击引导"
+#~ "器 <guibutton>配置</guibutton> 按钮,并改变引导器的安装位置。"
+
+#~ msgid ""
+#~ "Do not select a device e.g.\"sda\", or you will overwrite your existing "
+#~ "MBR. You must select the root partition that you chose during the "
+#~ "partitioning phase earlier, e.g. sda7."
+#~ msgstr ""
+#~ "请不要选择类似“sda”的设备,否则会覆盖现存的 MBR。您必须选择根分区(在之前"
+#~ "的分区操作中设置)作为安装对象"
+
+#~ msgid "To be clear, sda is a device, sda7 is a partition on that device."
+#~ msgstr "要清楚,sda 代表一个设备(磁盘),sda7 代表设备上的分区。"
+
+#~ msgid ""
+#~ "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
+#~ "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back "
+#~ "to the installer screen."
+#~ msgstr ""
+#~ "可以按下 Ctrl+Alt+F2 来转到 tty2,然后输入 <literal>df</literal> 来查看 "
+#~ "<literal>/</literal>(根分区)对应的分区编号。然后按下 Ctrl+Alt+F7 返回安"
+#~ "装界面。"
+
+#~ msgid "Bootloader advanced option"
+#~ msgstr "引导器高级选项"
+
+#~ msgid ""
+#~ "If you have very limited disk space for the <literal>/</literal> "
+#~ "partition that contains <literal>/tmp</literal>, click on "
+#~ "<guibutton>Advanced</guibutton> and check the box for <guilabel>Clean /"
+#~ "tmp at each boot</guilabel>. This helps to maintain some free space."
+#~ msgstr ""
+#~ "如果您的 <literal>/</literal> 分区对于 <literal>/tmp</literal> 来说太小,"
+#~ "请点击 <guibutton>Advanced</guibutton>,然后勾选 <guilabel>每次启动时清"
+#~ "理 /tmp</guilabel>。这有助于维持一定的空闲空间。"
+
+#~ msgid ""
#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
@@ -4609,10 +5027,3 @@ msgstr ""
#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
#~ "imageobject>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-#~ "imageobject>"