diff options
| author | Yuri Chornoivan <yurchor@ukr.net> | 2017-03-05 20:18:24 +0200 |
|---|---|---|
| committer | Yuri Chornoivan <yurchor@ukr.net> | 2017-03-05 20:18:24 +0200 |
| commit | 6e17ae56cc68f5ebfcad692101fb16d6b5a531ca (patch) | |
| tree | 9fa63dc23bb5af6fae3ef39f1f2d161fbfa99b55 /docs | |
| parent | e7ce9554efd4ba2e0b5652bab84c16cdb6861f7e (diff) | |
| download | tools-6e17ae56cc68f5ebfcad692101fb16d6b5a531ca.tar tools-6e17ae56cc68f5ebfcad692101fb16d6b5a531ca.tar.gz tools-6e17ae56cc68f5ebfcad692101fb16d6b5a531ca.tar.bz2 tools-6e17ae56cc68f5ebfcad692101fb16d6b5a531ca.tar.xz tools-6e17ae56cc68f5ebfcad692101fb16d6b5a531ca.zip | |
Update Chinese (Simplified) translation
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/installer/zh_CN.po | 595 | ||||
| -rw-r--r-- | docs/installer/zh_CN/SelectAndUseISOs2.xml | 66 | ||||
| -rw-r--r-- | docs/installer/zh_CN/addUser.xml | 50 | ||||
| -rw-r--r-- | docs/installer/zh_CN/chooseDesktop.xml | 30 | ||||
| -rw-r--r-- | docs/installer/zh_CN/choosePackageGroups.xml | 53 | ||||
| -rw-r--r-- | docs/installer/zh_CN/diskdrake.xml | 54 | ||||
| -rw-r--r-- | docs/installer/zh_CN/doPartitionDisks.xml | 59 | ||||
| -rw-r--r-- | docs/installer/zh_CN/exitInstall.xml | 37 | ||||
| -rw-r--r-- | docs/installer/zh_CN/misc-params.xml | 116 | ||||
| -rw-r--r-- | docs/installer/zh_CN/reboot.xml | 32 | ||||
| -rw-r--r-- | docs/installer/zh_CN/selectCountry.xml | 67 | ||||
| -rw-r--r-- | docs/installer/zh_CN/setupBootloader.xml | 220 | ||||
| -rw-r--r-- | docs/installer/zh_CN/setupBootloaderAddEntry.xml | 57 | ||||
| -rw-r--r-- | docs/installer/zh_CN/soundConfig.xml | 36 | ||||
| -rw-r--r-- | docs/installer/zh_CN/uninstall-Mageia.xml | 5 |
15 files changed, 559 insertions, 918 deletions
diff --git a/docs/installer/zh_CN.po b/docs/installer/zh_CN.po index c5cbb94d..3285fe87 100644 --- a/docs/installer/zh_CN.po +++ b/docs/installer/zh_CN.po @@ -1,27 +1,29 @@ +# SOME DESCRIPTIVE TITLE # Copyright (C) YEAR Mageia # This file is distributed under the same license as the Mageia Installer Help package. # # Translators: -# 吴善俊 <sjwuny@126.com>, 2013. -# xiaobo zhou <zhouxiaobo.500@gmail.com>, 2014. -# xiao wenming <xwm-citcc5@hotmail.com>, 2015. -# zwpwjwtz <zwpwjwtz@126.com>, 2016. -# Yuri Chornoivan <yurchor@ukr.net>, 2016. +# 吴善俊 <sjwuny@126.com>, 2013 +# Xiaobo Zhou <zhouxiaobo.500@gmail.com>, 2014 +# xiao wenming <xwm-citcc5@hotmail.com>, 2015 +# Yuri Chornoivan <yurchor@ukr.net>, 2016 +# zwpwjwtz <zwpwjwtz@126.com>, 2016-2017 +# 吴善俊 <sjwuny@126.com>, 2013 +# Xiaobo Zhou <zhouxiaobo.500@gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: Mageia\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\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" +"PO-Revision-Date: 2017-03-05 13:47+0000\n" +"Last-Translator: zwpwjwtz <zwpwjwtz@126.com>\n" +"Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/" +"language/zh_CN/)\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"language/zh_CN/)\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Lokalize 1.5\n" #. type: Content of: <section><info><title> #: en/acceptLicense.xml:25 @@ -180,17 +182,16 @@ msgstr "用户和管理员管理" #. Lebarhon: 20170210 updated for Mageia 6 (umask) #. type: Content of: <section><mediaobject> #: en/addUser.xml:9 -#, fuzzy msgid "" "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref=" "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id=" "\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format=" "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>" msgstr "" -"<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>" #. type: Content of: <section><section><info><title> #: en/addUser.xml:20 @@ -284,22 +285,21 @@ msgstr "" #. type: Content of: <section><section><note><para> #: en/addUser.xml:80 -#, fuzzy msgid "" "Any user you add while installing Mageia, will have a both read and write " "protected home directory (umask=0027)." -msgstr "任何在安装 Mageia 时添加的用户将拥有一个全局可读（但写保护）的主目录。" +msgstr "" +"在安装 Mageia 期间添加的任何用户都将拥有读/写保护的主目录（即 umask=0027）。" #. type: Content of: <section><section><note><para> #: en/addUser.xml:83 -#, fuzzy msgid "" "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>中进行此操作。。" +"你可以在<emphasis>配置 - 概要</emphasis>一步中添加其他所需用户，只需选择" +"<emphasis>用户管理</emphasis>即可。" #. type: Content of: <section><section><note><para> #: en/addUser.xml:87 @@ -734,13 +734,12 @@ msgstr "" #. type: Content of: <section><mediaobject> #: en/chooseDesktop.xml:16 -#, fuzzy msgid "" "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" " "align=\"center\"/> </imageobject>" msgstr "" -"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> " -"</imageobject>" +"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" " +"align=\"center\"/> </imageobject>" #. type: Content of: <section><para> #: en/chooseDesktop.xml:21 @@ -767,13 +766,12 @@ msgstr "选择软件包组" #. Lebarhon 20170209 Updated SC #. type: Content of: <section><mediaobject> #: en/choosePackageGroups.xml:9 -#, fuzzy msgid "" "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png" "\" align=\"center\"/> </imageobject>" msgstr "" -"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align=" -"\"center\" format=\"PNG\" ></imagedata> </imageobject>" +"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png" +"\" align=\"center\"/> </imageobject>" #. type: Content of: <section><para> #: en/choosePackageGroups.xml:14 @@ -810,13 +808,12 @@ msgstr "单独选择软件包：您可以使用此选项来手动添加/移除 #. type: Content of: <section><para> #: en/choosePackageGroups.xml:38 -#, fuzzy msgid "" "Read <xref linkend=\"minimal-install\"/> for instructions on how to do a " "minimal install (without or with X & IceWM)." msgstr "" -"若要进行最小化安装（包含/不包含 X & IceWM），请阅读 <xref linkend=" -"\"minimal-install\"></xref>。" +"请阅读 <xref linkend=\"minimal-install\"/> 来了解如何进行最小化安装（包活或不" +"包括 X 服务和 IceWM 桌面环境）。" #. type: Content of: <section><info><title> #: en/choosePackagesTree.xml:4 @@ -1256,15 +1253,14 @@ msgstr "使用 DiskDrake 自定义磁盘分区方式" #. type: Content of: <section><mediaobject> #: 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>" msgstr "" -"<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>" #. type: Content of: <section><warning><para> #: en/diskdrake.xml:22 @@ -1324,13 +1320,12 @@ msgstr " 准备好时点击<guibutton>完成</guibutton>按钮。" #. type: Content of: <section><note><para> #: 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 below)" msgstr "" -"若您将 Mageia 安装在 UEFI 系统中，请确保磁盘上存在 ESP（EFI 系统分区）并被正" -"确挂载至 /boot/EFI（见下）。" +"若您需要在 UEFI 硬件上使用 Mageia，请确保您设置了 ESP（EFI 系统分区），并且已" +"被挂载至 /boot/EFI（见下）" #. type: Content of: <section><note><para><mediaobject> #: en/diskdrake.xml:57 @@ -1341,41 +1336,39 @@ msgstr "" #. 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>" +"<imageobject> <imagedata fileref=\"live-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\"/>" +msgstr "" +"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject" +"\" id=\"1\"/>" #. 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（见下）。" +"若您使用传统的硬件+GPT硬盘分区，请确保您设置了 BIOS 引导分区，并且为其指定了" +"正确的分区标志" #. 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>" +"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </" +"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/" +"> </imageobject>" #. type: Content of: <section><info><title> #: en/doPartitionDisks.xml:9 @@ -1401,22 +1394,20 @@ msgstr "根据特定硬盘布局和内容的不同，下列选项可能会有所 #. type: Content of: <section><mediaobject> #: en/doPartitionDisks.xml:22 -#, fuzzy msgid "" "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center" "\"/> </imageobject>" msgstr "" -"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </" -"imageobject>" +"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center" +"\"/> </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> <imagedata fileref=\"live-doPartitionDisks.png\"/> </" "imageobject>" #. type: Content of: <section><para><itemizedlist><listitem><para> @@ -1504,12 +1495,11 @@ msgstr "" #. 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> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </" "imageobject>" #. type: Content of: <section><para><itemizedlist><listitem><para> @@ -1619,35 +1609,35 @@ msgid "" "partitioning\" option to be able to create it with the Installer like any " "other partition, just select BIOS boot partition as filesystem type." msgstr "" +"若您使用传统的硬件（即 CSM 或 BIOS），并且使用 GPT 格式的硬盘分区，您需要先" +"创建一个 BIOS 引导分区。该分区一般为 1 MiB 左右，且不会被挂载。请选择“自定义" +"磁盘分区”，然后手动创建一个 BIOS 引导分区。" #. 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> <imagedata fileref=\"dx2-doPartitionDisks3.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> <imagedata fileref=\"live-doPartitionDisks3.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> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </" "imageobject>" #. type: Content of: <section><warning><para> @@ -1791,14 +1781,12 @@ msgstr "恭喜" #. Lebarhon 20170209 updated SC #. type: Content of: <section><mediaobject> #: en/exitInstall.xml:9 -#, fuzzy msgid "" "<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>" +"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" " +"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>" #. type: Content of: <section><para> #: en/exitInstall.xml:14 @@ -2569,10 +2557,10 @@ msgstr "一些杂项" #. Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC #. type: Content of: <section><mediaobject> #: en/misc-params.xml:10 -#, fuzzy msgid "" "<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>" -msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>" +msgstr "" +"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>" #. type: Content of: <section><para> #: en/misc-params.xml:15 @@ -2590,22 +2578,22 @@ msgstr "" msgid "" "As a general rule, default settings are recommended and you can keep them " "with 3 exceptions:" -msgstr "" +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 "" +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 "" +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 "" +msgstr "后续章节中所提到的其他情况" #. type: Content of: <section><section><info><title> #: en/misc-params.xml:39 @@ -2653,9 +2641,8 @@ msgstr "DrakX 为引导器进行了自动设置。" #. type: Content of: <section><section><itemizedlist><listitem><para> #: en/misc-params.xml:66 -#, fuzzy msgid "Do not change anything, unless you know how to configure Grub2" -msgstr "不更改任何选项，除非您懂得如何配置 GRUB 和/或 Lilo" +msgstr "除非您懂得如何配置 GRUB 2，否则请勿更改这些配置" #. type: Content of: <section><section><itemizedlist><listitem><para> #: en/misc-params.xml:69 @@ -2724,6 +2711,8 @@ 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:118 @@ -2769,14 +2758,12 @@ msgstr "更多信息，参见 <xref linkend=\"configureX_chooser\"/>." #. type: Content of: <section><section><mediaobject> #: en/misc-params.xml:147 -#, fuzzy msgid "" "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align=" "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>" msgstr "" -"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-" -"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision=" -"\"1\"/> </imageobject>" +"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align=" +"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>" #. type: Content of: <section><section><info><title> #: en/misc-params.xml:155 @@ -2864,12 +2851,13 @@ msgstr "防火墙将保护您的重要数据，以免其被他人恶意利用或 #. type: Content of: <section><section><itemizedlist><listitem><para> #: 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. For more " "information, see <xref linkend=\"firewall\"/>." -msgstr "请选择允许访问本系统的服务。您的选项应当基于计算机的期望用途。" +msgstr "" +"选择您需要使用的服务，这取决与您希望如何使用您的计算机。有关更多信息，请参见 " +"<xref linkend=\"firewall\"/>。" #. type: Content of: <section><section><itemizedlist><listitem><warning><para> #: en/misc-params.xml:222 @@ -2883,45 +2871,39 @@ msgstr "重新启动" #. type: Content of: <section><para> #: en/reboot.xml:9 -#, fuzzy msgid "" "Once the bootloader has been installed, you will be prompted to halt your " "computer, remove the live CD and restart the computer, click on <emphasis " "role=\"bold\"><guibutton>Finish</guibutton></emphasis> and act as " "asked<emphasis role=\"bold\"> in this order!</emphasis>" msgstr "" -"在安装了引导起之后，程序将提示您关闭计算机，移除 Live CD 并重启计算机。重启" -"后，您将会看到一个下载进度条，它将提示您正在下载的软件媒体（参见“软件管" -"理”）。" +"一旦安装了引导器，安装程序将会提示您重启电脑，此时请移除 Live CD 并重启。请点" +"击<guibutton>完成</guibutton></emphasis>并<emphasis role=\"bold\">根据提示的" +"步骤</emphasis>进行操作。" #. 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>" +msgstr "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>" #. type: Content of: <section><para> #: en/reboot.xml:20 -#, fuzzy msgid "" "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>" +"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-" +"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>" #. type: Content of: <section><info><title> #: en/resizeFATChoose.xml:16 @@ -3122,9 +3104,8 @@ msgstr "" #. type: Content of: <section><section><section><section><itemizedlist><listitem><para> #: en/SelectAndUseISOs2.xml:109 -#, fuzzy msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)." -msgstr "每个 ISO 仅包含一种桌面环境（KDE 或 GNOME）。" +msgstr "每个 ISO 仅包含一种桌面环境（KDE、GNOME 或 Xfce）。" #. type: Content of: <section><section><section><section><itemizedlist><listitem><para> #: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142 @@ -3150,15 +3131,13 @@ msgstr "其中包含非自由软件。" #. type: Content of: <section><section><section><section><title> #: 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:134 -#, fuzzy msgid "Plasma desktop environment only." -msgstr "仅包含 KDE 桌面环境。" +msgstr "仅包含 KDE（Plasma）桌面环境。" #. type: Content of: <section><section><section><section><itemizedlist><listitem><para> #: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156 @@ -3178,15 +3157,13 @@ msgstr "仅包含 GNOME 桌面环境。" #. type: Content of: <section><section><section><section><title> #: en/SelectAndUseISOs2.xml:166 -#, fuzzy msgid "Live DVD Xfce" -msgstr "Live DVD KDE" +msgstr "Live DVD Xfce" #. type: Content of: <section><section><section><section><itemizedlist><listitem><para> #: en/SelectAndUseISOs2.xml:170 -#, fuzzy msgid "Xfce desktop environment only." -msgstr "仅包含 KDE 桌面环境。" +msgstr "仅包含 Xfce 桌面环境。" #. type: Content of: <section><section><section><title> #: en/SelectAndUseISOs2.xml:185 @@ -3222,9 +3199,8 @@ msgstr "仅包含英语支持。" #. type: Content of: <section><section><section><section><title> #: en/SelectAndUseISOs2.xml:218 -#, fuzzy msgid "netinstall.iso" -msgstr "启动安装" +msgstr "netinstall.iso" #. type: Content of: <section><section><section><section><itemizedlist><listitem><para> #: en/SelectAndUseISOs2.xml:222 @@ -3235,9 +3211,8 @@ msgstr "仅包含自由软件，适用于不希望使用非自由软件的人。 #. type: Content of: <section><section><section><section><title> #: en/SelectAndUseISOs2.xml:229 -#, fuzzy msgid "netinstall-nonfree.iso" -msgstr "boot-nonfree.iso" +msgstr "netinstall-nonfree.iso" #. type: Content of: <section><section><section><section><itemizedlist><listitem><para> #: en/SelectAndUseISOs2.xml:233 @@ -3607,18 +3582,15 @@ msgstr "选择您所在的国家/地区" #. Lebarhon 2016 12 16 updated for Mageia 6 #. type: Content of: <section><mediaobject> #: en/selectCountry.xml:9 -#, fuzzy msgid "" "<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align=" "\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>" msgstr "" -"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-" -"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision=" -"\"1\"/> </imageobject>" +"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align=" +"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>" #. type: Content of: <section><para> #: en/selectCountry.xml:14 -#, fuzzy msgid "" "Select your country or region. This is important for all kinds of settings, " "like the currency and wireless regulatory domain. Setting the wrong country " @@ -3654,7 +3626,6 @@ msgstr "输入法" #. type: Content of: <section><section><para> #: 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 " @@ -3664,22 +3635,19 @@ msgid "" "and can be installed if you added HTTP/FTP media before package selection." msgstr "" "在 <guilabel>其他国家</guilabel> 窗口中，您也可以选择一种输入法（位于列表底" -"部）。输入法用于输入各类语言中的字符（中文、日文、韩文等）。IBus 是 Mageia " -"DVD、Africa/India 和 Asia/no-India 的默认选项。对于亚洲和非洲区域设置，安装程" -"序会自动选择 IBus 作为默认输入法，因此用户无需手动配置。其他输入法（SCIM、" -"GCIN、HIME 等）可以提供类似的功能，您可以在选择软件包前通过添加 HTTP/FTP 媒体" -"来安装它们。" +"部）。输入法用于输入各类语言中的字符（中文、日文、韩文等）。IBus 是默认选项，" +"一般情况下用户无需手动配置。其他输入法（SCIM、GCIN、HIME 等）可以提供类似的功" +"能，您可以在选择软件包前通过添加 HTTP/FTP 媒体来安装它们。" #. type: Content of: <section><section><note><para> #: 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\" -> " "\"System\", or by running localedrake as root." msgstr "" -"若您在安装期间缺少输入法，您可以在安装完成后通过“配置我的电脑”->“系统”设置" -"来安装输入法，或者以 root 身份运行 localedrake。" +"若您在安装期间缺少输入法，您可以在安装完成后通过“配置我的电脑”->“系统”设置来" +"安装输入法，或者以 root 身份运行 localedrake。" #. type: Content of: <section><info><title> #: en/selectInstallClass.xml:21 @@ -3991,18 +3959,18 @@ msgid "" "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 "" +"为此，您需要手动编辑 /boot/grub2/custom.cfg，或者使用 grub-customizer（可以" +"从 Mageia 仓库中安装）来编辑引导项。" #. 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>。" +"有关更多信息，请参考我们的 wiki：<link ns2:href=\"https://wiki.mageia.org/en/" +"Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>" #. type: Content of: <section><info><title> #: en/setupBootloader.xml:9 @@ -4011,26 +3979,24 @@ msgstr "引导程序的主要选项" #. type: Content of: <section><section><title> #: en/setupBootloader.xml:13 -#, fuzzy msgid "Bootloader interface" -msgstr "引导程序的主要选项" +msgstr "引导器界面" #. type: Content of: <section><section><para> #: en/setupBootloader.xml:15 msgid "By default, Mageia uses exclusively:" -msgstr "" +msgstr "默认情况下，Mageia 仅使用：" #. type: Content of: <section><section><itemizedlist><listitem><para> #: en/setupBootloader.xml:19 msgid "" "Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system" -msgstr "" +msgstr "GRUB2（包含/不包含图形界面），当使用传统硬件 + MBR/GPT格式分区时" #. type: Content of: <section><section><itemizedlist><listitem><para> #: en/setupBootloader.xml:24 -#, fuzzy msgid "Grub2-efi for a UEFI system." -msgstr "使用 UEFI 系统" +msgstr "GRUB2-efi，当使用 UEFI 硬件时。" #. type: Content of: <section><section><tip><para> #: en/setupBootloader.xml:29 @@ -4040,26 +4006,23 @@ msgstr "Mageia 的图形化菜单：" #. type: Content of: <section><section><section><title> #: en/setupBootloader.xml:33 msgid "Grub2 on Legacy/MBR and Legacy/GPT systems" -msgstr "" +msgstr "GRUB2，当使用传统硬件 + MBR/GPT 格式分区时" #. type: Content of: <section><section><section><mediaobject> #: en/setupBootloader.xml:36 -#, fuzzy msgid "" "<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>" msgstr "" -"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </" -"imageobject>" +"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>" #. type: Content of: <section><section><section><mediaobject> #: en/setupBootloader.xml:42 -#, fuzzy msgid "" "<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-" "setupBootloader.png\"/> </imageobject>" msgstr "" -"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </" -"imageobject>" +"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-" +"setupBootloader.png\"/> </imageobject>" #. type: Content of: <section><section><section><para> #: en/setupBootloader.xml:47 en/setupBootloader.xml:78 @@ -4068,13 +4031,11 @@ msgstr "若您不确定如何操作，请不要修改“引导设备”。" #. type: Content of: <section><section><section><title> #: en/setupBootloader.xml:52 -#, fuzzy msgid "Grub2-efi on UEFI systems" -msgstr "使用 UEFI 系统" +msgstr "GRUB2-efi，当使用 UEFI 硬件时" #. type: Content of: <section><section><section><para> #: en/setupBootloader.xml:54 -#, fuzzy msgid "" "With an UEFI system, the user interface is slightly different as you cannot " "choose between with or without graphical menu" @@ -4092,17 +4053,15 @@ msgstr "" #. type: Content of: <section><section><section><mediaobject> #: en/setupBootloader.xml:64 -#, fuzzy msgid "" "<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </" "imageobject>" msgstr "" -"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </" +"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </" "imageobject>" #. type: Content of: <section><section><section><para> #: en/setupBootloader.xml:69 -#, fuzzy 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). " @@ -4126,19 +4085,19 @@ msgstr "使用 Mageia 提供的引导器" #. type: Content of: <section><section><para> #: en/setupBootloader.xml:86 msgid "By default, according to your system, Mageia writes a new:" -msgstr "" +msgstr "默认情况下，根据您的硬件情况，Mageia 会将：" #. type: Content of: <section><section><itemizedlist><listitem><para> #: en/setupBootloader.xml:90 msgid "" "GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard " "drive or in the BIOS boot partition." -msgstr "" +msgstr "GRUB 2 引导器安装至 MBR（主引导记录）区域或第一硬盘的 BIOS 引导分区。" #. type: Content of: <section><section><itemizedlist><listitem><para> #: en/setupBootloader.xml:95 msgid "Grub2-efi bootloader into the ESP" -msgstr "" +msgstr "GRUB2-efi 引导器安装至 ESP" #. type: Content of: <section><section><para> #: en/setupBootloader.xml:99 @@ -4148,25 +4107,26 @@ msgid "" "click on <guibutton>Next</guibutton> and then uncheck the box " "<guilabel>Probe Foreign OS</guilabel>" msgstr "" +"若您已安装了其他操作系统，Mageia 会尝试将它们也添加到 Mageia 的引导菜单。如果" +"您不希望 Mageia 这么做，请点击<guibutton>下一步</guibutton>，然后取消勾选" +"<guilabel>检测其他操作系统</guilabel>" #. type: Content of: <section><section><mediaobject> #: en/setupBootloader.xml:105 -#, fuzzy msgid "" "<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </" "imageobject>" msgstr "" -"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </" +"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </" "imageobject>" #. type: Content of: <section><section><mediaobject> #: en/setupBootloader.xml:111 -#, fuzzy msgid "" "<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </" "imageobject>" msgstr "" -"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </" +"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </" "imageobject>" #. type: Content of: <section><section><title> @@ -4190,7 +4150,7 @@ msgstr "" #. type: Content of: <section><section><title> #: en/setupBootloader.xml:128 msgid "Using the chain loading" -msgstr "" +msgstr "使用链式加载（chain loading）" #. type: Content of: <section><section><para> #: en/setupBootloader.xml:130 @@ -4199,25 +4159,26 @@ msgid "" "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，请点击" +"<guibutton>下一步</guibutton>，然后点击<guibutton>高级</guibutton>并勾选 " +"<guilabel>不要修改 ESP 或 MBR</guilabel>。" #. 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> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </" "imageobject>" #. type: Content of: <section><section><mediaobject> #: en/setupBootloader.xml:142 -#, fuzzy msgid "" "<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </" "imageobject>" msgstr "" -"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </" +"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </" "imageobject>" #. type: Content of: <section><section><para> @@ -4226,26 +4187,26 @@ msgid "" "You will get a warning that the bootloader will lack, ignore it by a click " "on <guibutton>OK</guibutton>." msgstr "" +"安装程序将会提醒您缺少引导器，请忽略它并点击<guibutton>确定</guibutton>。" #. type: Content of: <section><section><mediaobject> #: en/setupBootloader.xml:151 -#, fuzzy msgid "" "<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </" "imageobject>" msgstr "" -"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </" +"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </" "imageobject>" #. type: Content of: <section><section><title> #: en/setupBootloader.xml:158 msgid "Options" -msgstr "" +msgstr "选项" #. type: Content of: <section><section><section><title> #: en/setupBootloader.xml:161 msgid "First page" -msgstr "" +msgstr "第一页" #. type: Content of: <section><section><section><para><itemizedlist><listitem><para> #: en/setupBootloader.xml:165 @@ -4254,6 +4215,8 @@ msgid "" "lets you set a delay in seconds before the default operating system is " "started up." msgstr "" +"<guilabel>自动引导之前等待</guilabel>：此文本框用于设置在等待多少秒之后自动进" +"入默认选定的操作系统。" #. type: Content of: <section><section><section><para><itemizedlist><listitem><para> #: en/setupBootloader.xml:171 @@ -4262,29 +4225,29 @@ msgid "" "bootloader. This means other people can not enter single user mode or change " "settings at the boot time." msgstr "" +"<guilabel>安全</guilabel>：用于设置引导器的密码。可以防止其他人进入单用户模" +"式，或者修改引导参数。" #. type: Content of: <section><section><section><para><itemizedlist><listitem><para> #: en/setupBootloader.xml:177 msgid "" "<guilabel>Password</guilabel>: This text box is where you actually put the " "password" -msgstr "" +msgstr "<guilabel>密码</guilabel>：此文本框用于输入密码" #. type: Content of: <section><section><section><para><itemizedlist><listitem><para> #: en/setupBootloader.xml:182 -#, fuzzy msgid "" "<guilabel>Password (again)</guilabel>: Retype the password and Drakx will " "check that it matches with the one set above." msgstr "" -"<guilabel>密码（重复）</guilabel>：再输入依次用户密码。drakx 将会检查两次输入" -"的密码是否一致。" +"<guilabel>确认密码</guilabel>：再次输入密码，安装程序将检查您两次输入的密码是" +"否一致。" #. 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>:" +msgstr "<guilabel>高级</guilabel>" #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para> #: en/setupBootloader.xml:192 @@ -4323,12 +4286,12 @@ msgstr "" #. type: Content of: <section><section><section><title> #: en/setupBootloader.xml:226 msgid "Next page" -msgstr "" +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 "" +msgstr "<guilabel>默认</guilabel>：使用默认引导参数" #. type: Content of: <section><section><section><itemizedlist><listitem><para> #: en/setupBootloader.xml:235 @@ -4336,6 +4299,7 @@ msgid "" "<guilabel>Append:</guilabel> This option lets you pass the kernel " "information or tell the kernel to give you more information as it boots." msgstr "" +"<guilabel>追加</guilabel> ：用于在默认引导选项后添加额外所需的内核参数。" #. type: Content of: <section><section><section><itemizedlist><listitem><para> #: en/setupBootloader.xml:241 @@ -4343,6 +4307,8 @@ msgid "" "<guilabel>Probe foreign OS</guilabel>: see above <link linkend=" "\"setupMageiaBootloader\">Using a Mageia bootloader</link>" msgstr "" +"<guilabel>探测其他系统</guilabel>：参见<link linkend=\"setupMageiaBootloader" +"\">使用 Mageia 引导器</link>" #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para> #: en/setupBootloader.xml:247 @@ -4351,6 +4317,8 @@ msgid "" "the boot menu will use. If you click the down triangle you will be offered " "other size and colour depth options." msgstr "" +"<guilabel>图像模式</guilabel>：用于设定显示引导菜单时的屏幕分辨率和色彩深度。" +"若要从可用的模式中进行选择，请点击下三角标记。" #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para> #: en/setupBootloader.xml:254 @@ -4358,6 +4326,8 @@ msgid "" "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link " "linkend=\"setupChainLoading\">Using the chain loading</link>" msgstr "" +"<emphasis role=\"bold\">不要修改 ESP 或 MBR</emphasis>：参见<link linkend=" +"\"setupChainLoading\">使用链式加载</link>" #. type: Content of: <section><info><title> #: en/setupSCSI.xml:11 @@ -4411,13 +4381,12 @@ msgstr "声音配置" #. Lebarhon 20170209 updated SC #. type: Content of: <section><mediaobject> #: en/soundConfig.xml:9 -#, fuzzy msgid "" "<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>" +"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:" +"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>" #. type: Content of: <section><para> #: en/soundConfig.xml:14 @@ -4737,293 +4706,3 @@ msgid "" 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>" -#~ msgstr "" -#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-" -#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id=" -#~ "\"bootloaderConfiguration-im1\"/> </imageobject>" - -#~ msgid "" -#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-" -#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </" -#~ "imageobject>" -#~ msgstr "" -#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-" -#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </" -#~ "imageobject>" diff --git a/docs/installer/zh_CN/SelectAndUseISOs2.xml b/docs/installer/zh_CN/SelectAndUseISOs2.xml index 2e60f649..84fd3b6b 100644 --- a/docs/installer/zh_CN/SelectAndUseISOs2.xml +++ b/docs/installer/zh_CN/SelectAndUseISOs2.xml @@ -1,8 +1,10 @@ -<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="Select-and-use-ISOs" version="5.0" xml:lang="zh_CN"> +<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_CN" xml:id="Select-and-use-ISOs"> <info> - <!-- Made by Lebarhon 2014 03 26 --> + <!-- Made by Lebarhon 2014 03 26 + +Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about 1.3.2--> <title xml:id="Select-and-use-ISOs-ti1">选择和使用 ISO</title> </info> @@ -75,28 +77,6 @@ </listitem> </itemizedlist> </section> - - <section> - <title>DVD 双架构</title> - - <itemizedlist> - <listitem> - <para>同一媒介中包含两种架构。程序将根据检测到的 CPU 类型自动做出选择。</para> - </listitem> - - <listitem> - <para>仅使用 Xfce 桌面。</para> - </listitem> - - <listitem> - <para>并非所有语言都有完整支持。（be, bg, ca, de, en, es, fr, it, mk, pl, pt, ru, sv, uk）请认真核对！</para> - </listitem> - - <listitem> - <para>其中包含非自由软件。</para> - </listitem> - </itemizedlist> - </section> </section> <section> @@ -111,7 +91,7 @@ </listitem> <listitem> - <para>每个 ISO 仅包含一种桌面环境（KDE 或 GNOME）。</para> + <para>每个 ISO 仅包含一种桌面环境（KDE、GNOME 或 Xfce）。</para> </listitem> <listitem> @@ -129,25 +109,25 @@ </section> <section> - <title>Live CD KDE</title> + <title>Live DVD KDE</title> <itemizedlist> <listitem> - <para>仅包含 KDE 桌面环境。</para> + <para>仅包含 KDE（Plasma）桌面环境。</para> </listitem> <listitem> - <para>仅包含英语支持。</para> + <para>包含所有语言支持。</para> </listitem> <listitem> - <para>仅使用 32 位架构。</para> + <para>媒介有 32 位和 64 位两种架构之分。</para> </listitem> </itemizedlist> </section> <section> - <title>Live CD GNOME</title> + <title>Live DVD GNOME</title> <itemizedlist> <listitem> @@ -155,24 +135,6 @@ </listitem> <listitem> - <para>仅包含英语支持。</para> - </listitem> - - <listitem> - <para>仅使用 32 位架构。</para> - </listitem> - </itemizedlist> - </section> - - <section> - <title>Live DVD KDE</title> - - <itemizedlist> - <listitem> - <para>仅包含 KDE 桌面环境。</para> - </listitem> - - <listitem> <para>包含所有语言支持。</para> </listitem> @@ -183,11 +145,11 @@ </section> <section> - <title>Live DVD GNOME</title> + <title>Live DVD Xfce</title> <itemizedlist> <listitem> - <para>仅包含 GNOME 桌面环境。</para> + <para>仅包含 Xfce 桌面环境。</para> </listitem> <listitem> @@ -228,7 +190,7 @@ </section> <section> - <title>boot.iso</title> + <title>netinstall.iso</title> <itemizedlist> <listitem> @@ -238,7 +200,7 @@ </section> <section> - <title>boot-nonfree.iso</title> + <title>netinstall-nonfree.iso</title> <itemizedlist> <listitem> diff --git a/docs/installer/zh_CN/addUser.xml b/docs/installer/zh_CN/addUser.xml index 0c9f1547..034c2203 100644 --- a/docs/installer/zh_CN/addUser.xml +++ b/docs/installer/zh_CN/addUser.xml @@ -1,42 +1,16 @@ -<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="addUser" version="5.0" xml:lang="zh_CN"> +<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_CN" xml:id="addUser"> <info> <title xml:id="addUser-ti1">用户和管理员管理</title> </info> - - - - - - - - - - - - - - <mediaobject> -<!-- 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--> -<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></mediaobject> +<!-- Lebarhon: 20170210 updated for Mageia 6 (umask)--> +<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></mediaobject> <section xml:id="root-password"> <info> @@ -84,21 +58,15 @@ linkend="givePassword"/>）</para> </itemizedlist> <note> - <para>任何在安装 Mageia 时添加的用户将拥有一个全局可读（但写保护）的主目录。</para> - - <para>不过，在使用系统时，通过 <emphasis>Mageia 控制中心 - 系统 --管理系统用户</emphasis>添加的用户将拥有其他用户不可读且不可写的主目录。</para> - - <para>若您不希望为任何人创建全局可读的主目录，则现在最好只添加一个临时用户，然后在重启后添加您所需要的用户。</para> + <para>在安装 Mageia 期间添加的任何用户都将拥有读/写保护的主目录（即 umask=0027）。</para> - <para>若您需要全局可读主目录，你可能需要在安装的<emphasis>配置 - -概要</emphasis>这一步中添加有此需要的用户。请在<emphasis>用户管理</emphasis>中进行此操作。。</para> + <para>你可以在<emphasis>配置 - 概要</emphasis>一步中添加其他所需用户，只需选择<emphasis>用户管理</emphasis>即可。</para> <para>也可以在安装完成后改变访问权限。</para> </note> </section> - <section condition="classical" xml:id="addUserAdvanced"> + <section xml:id="addUserAdvanced" condition="classical"> <info> <title xml:id="addUserAdvanced-ti3">高级用户管理</title> </info> diff --git a/docs/installer/zh_CN/chooseDesktop.xml b/docs/installer/zh_CN/chooseDesktop.xml index ce13ef95..94408611 100644 --- a/docs/installer/zh_CN/chooseDesktop.xml +++ b/docs/installer/zh_CN/chooseDesktop.xml @@ -1,27 +1,21 @@ -<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_CN" xml:id="chooseDesktop"> - - - <!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page--> +<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_CN" xml:id="chooseDesktop"> + <!--Lebarhon 20170209 updated SC--> <info> - <title xml:id="chooseDesktop-ti1">桌面环境选择</title> - </info> - - + <title xml:id="chooseDesktop-ti1">桌面环境选择</title> + </info> + - <para>根据所选项不同，随后会出现不同的窗口用于详细设置。</para> + <para>根据所选项不同，随后会出现不同的窗口用于详细设置。</para> - <para>在选择完成之后，将会在安装软件包时展示一系列幻灯片。可以按 <guilabel>详细</guilabel> 按钮来关闭幻灯片显示。</para> + <para>在选择完成之后，将会在安装软件包时展示一系列幻灯片。可以按 <guilabel>详细</guilabel> 按钮来关闭幻灯片显示。</para> + <mediaobject> +<imageobject> <imagedata format="PNG" fileref="dx2-chooseDesktop.png" +align="center"/> </imageobject></mediaobject> - -<mediaobject> -<imageobject> <imagedata fileref="dx2-chooseDesktop.png" align="center" -format="PNG" ></imagedata> </imageobject></mediaobject> - - <para>请选择 <application>KDE</application> 或 <application>GNOME</application> + <para>请选择 <application>KDE</application> 或 <application>GNOME</application> 作为桌面环境。这两种环境均包含有用的应用程序盒工具。若希望全部安装或均不安装，或自定义要安装的默认软件，请点击 <guilabel>自定义</guilabel>。<application>LXDE</application> 桌面环境较前两者更加轻便，视觉效果较低，默认安装的软件包也更少。</para> - </section> - +</section>
\ No newline at end of file diff --git a/docs/installer/zh_CN/choosePackageGroups.xml b/docs/installer/zh_CN/choosePackageGroups.xml index ec63e823..ae613476 100644 --- a/docs/installer/zh_CN/choosePackageGroups.xml +++ b/docs/installer/zh_CN/choosePackageGroups.xml @@ -1,35 +1,34 @@ -<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_CN" xml:id="choosePackageGroups"> +<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_CN" xml:id="choosePackageGroups"> + <info> + <title xml:id="choosePackageGroups-ti1">选择软件包组</title> + </info> - <info> - <title xml:id="choosePackageGroups-ti1">选择软件包组</title> - </info> + - + <mediaobject> +<!--Lebarhon 20170209 Updated SC--> +<imageobject> <imagedata format="PNG" fileref="dx2-choosePackageGroups.png" +align="center"/> </imageobject></mediaobject> -<mediaobject> -<!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page--> -<imageobject> <imagedata fileref="dx2-choosePackageGroups.png" -align="center" format="PNG" ></imagedata> </imageobject></mediaobject> + <para>软件包按组列出，您可以更方便地选择所需软件。若需要查看某一组的详细说明，请将鼠标移至该组的名称上方。</para> - <para>软件包按组列出，您可以更方便地选择所需软件。若需要查看某一组的详细说明，请将鼠标移至该组的名称上方。</para> + <itemizedlist> + <listitem> + <para>工作区</para> + </listitem> - <itemizedlist> - <listitem> - <para>工作区</para> - </listitem> + <listitem> + <para>服务器。</para> + </listitem> - <listitem> - <para>服务器。</para> - </listitem> + <listitem> + <para>图形界面环境</para> + </listitem> - <listitem> - <para>图形界面环境</para> - </listitem> - - <listitem> - <para>单独选择软件包：您可以使用此选项来手动添加/移除软件包。</para> - </listitem> - </itemizedlist> - <para>若要进行最小化安装（包含/不包含 X & IceWM），请阅读 <xref linkend="minimal-install"></xref>。</para> - </section> + <listitem> + <para>单独选择软件包：您可以使用此选项来手动添加/移除软件包。</para> + </listitem> + </itemizedlist> + <para>请阅读 <xref linkend="minimal-install"/> 来了解如何进行最小化安装（包活或不包括 X 服务和 IceWM 桌面环境）。</para> +</section>
\ No newline at end of file diff --git a/docs/installer/zh_CN/diskdrake.xml b/docs/installer/zh_CN/diskdrake.xml index ac87c714..2e37d570 100644 --- a/docs/installer/zh_CN/diskdrake.xml +++ b/docs/installer/zh_CN/diskdrake.xml @@ -1,58 +1,48 @@ <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_CN" xml:id="diskdrake"> - - - - - - - - - - - - <info> - <!-- Started by marja on 2012 03 29 --> -<!-- NEEDS TO BE WRITTEN AND THEN REVIEWED! --> -<!-- JohnR added note for bug 133 re encrypted partitions --> -<!-- JohnR 2012-04-10 - tidy up module formatting --> -<!-- Marja, 2012-04-18 changed "If you wish to use encryption on - any of your partitions" into "If you wish to use encryption on - your <literal> -/</literal> partition" because pterjan said this is only for root - Also added some text. --> -<!--marja 20120418 moved section end tag down to where it belongs--> -<!--marja 20120418 added para 6a--> + <!-- Lebarhon 2016 12 16 updated for Mageia 6 + +Lebarhon 20170902 added SC--> <title xml:id="diskdrake-ti1">使用 DiskDrake 自定义磁盘分区方式</title> </info> <mediaobject> -<imageobject condition='classical'> <imagedata fileref="dx2-diskdrake.png" -align="center"/> </imageobject> <imageobject condition='live' > <imagedata +<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake.png" +align="center"/> </imageobject> <imageobject condition="live"> <imagedata fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject> <warning> <para revision="3" xml:id="diskdrake-pa1">若您希望将 <literal>/</literal> 分区加密，您必须确保 /boot 位于单独的分区中，并且该分区不能被加密；否则，系统将无法启动。</para> </warning> - <para revision="2" xml:id="diskdrake-pa3">在此处调整磁盘布局。您可以移除或创建分区、改变文件系统类型或改变分区大小，同时预览操作后的效果。</para> + <para xml:id="diskdrake-pa3" revision="2">在此处调整磁盘布局。您可以移除或创建分区、改变文件系统类型或改变分区大小，同时预览操作后的效果。</para> - <para revision="1" xml:id="diskdrake-pa4">每个硬盘及其他存储设备（如 U 盘）都在对应的标签页中显示。例如，在三个标签页中分别显示 sda、sdb、sdc 的磁盘布局。</para> + <para xml:id="diskdrake-pa4" revision="1">每个硬盘及其他存储设备（如 U 盘）都在对应的标签页中显示。例如，在三个标签页中分别显示 sda、sdb、sdc 的磁盘布局。</para> - <para revision="1" xml:id="diskdrake-pa5">点击 <guibutton>全部清除</guibutton> 可以删除所选设备上的全部分区。</para> + <para xml:id="diskdrake-pa5" revision="1">点击 <guibutton>全部清除</guibutton> 可以删除所选设备上的全部分区。</para> - <para revision="1" xml:id="diskdrake-pa6">对于其他操作：请先点击要操作的分区；然后查看其详细信息，或选择文件系统和挂载点，改变其大小或擦除它。</para> + <para xml:id="diskdrake-pa6" revision="1">对于其他操作：请先点击要操作的分区；然后查看其详细信息，或选择文件系统和挂载点，改变其大小或擦除它。</para> <para xml:id="diskdrake-pa6a" revision="1">请继续，直到所需操作完成。</para> - <para revision="1" xml:id="diskdrake-pa7"> 准备好时点击<guibutton>完成</guibutton>按钮。</para> + <para xml:id="diskdrake-pa7" revision="1"> 准备好时点击<guibutton>完成</guibutton>按钮。</para> <note> - <para>若您将 Mageia 安装在 UEFI 系统中，请确保磁盘上存在 ESP（EFI 系统分区）并被正确挂载至 /boot/EFI（见下）。</para> + <para>若您需要在 UEFI 硬件上使用 Mageia，请确保您设置了 ESP（EFI 系统分区），并且已被挂载至 /boot/EFI（见下）</para> <para><mediaobject> -<imageobject> <imagedata fileref="dx2-diskdrake2.png"/> </imageobject></mediaobject></para> +<imageobject> <imagedata fileref="dx2-diskdrake2.png"/> </imageobject></mediaobject><mediaobject> +<imageobject> <imagedata fileref="live-diskdrake2.png"/> </imageobject></mediaobject></para> + </note> + + <note> + <para>若您使用传统的硬件+GPT硬盘分区，请确保您设置了 BIOS 引导分区，并且为其指定了正确的分区标志</para> + + <mediaobject> +<imageobject> <imagedata fileref="dx2-doPartitionDisks3.png"/> +</imageobject> <imageobject> <imagedata +fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject> </note> </section>
\ No newline at end of file diff --git a/docs/installer/zh_CN/doPartitionDisks.xml b/docs/installer/zh_CN/doPartitionDisks.xml index fdc71e7c..52d27388 100644 --- a/docs/installer/zh_CN/doPartitionDisks.xml +++ b/docs/installer/zh_CN/doPartitionDisks.xml @@ -5,40 +5,46 @@ <info> <!----> -<!-- lebarhon 2015-07-03 Suggested updates for Mageia 5 --> +<!-- lebarhon 20161216 updated for Mageia 6 + +lebarhon 20170209 added SC--> <title xml:id="doPartitionDisks-ti1">分区</title> </info> - <para revision="1" xml:id="doPartitionDisks-pa1">在此处您可以查看硬盘驱动器中的内容，并选择 DrakX 分区向导所提供的 <application>Mageia</application> + <para xml:id="doPartitionDisks-pa1" revision="1">在此处您可以查看硬盘驱动器中的内容，并选择 DrakX 分区向导所提供的 <application>Mageia</application> 的安装方法。</para> - <para revision="1" xml:id="doPartitionDisks-pa2">根据特定硬盘布局和内容的不同，下列选项可能会有所不同。</para> + <para xml:id="doPartitionDisks-pa2" revision="1">根据特定硬盘布局和内容的不同，下列选项可能会有所不同。</para> + + <mediaobject> +<imageobject> <imagedata fileref="dx2-doPartitionDisks.png" align="center"/> +</imageobject></mediaobject> <mediaobject> -<imageobject> <imagedata align="center" fileref="dx2-doPartitionDisks.png"/> +<imageobject> <imagedata fileref="live-doPartitionDisks.png"/> </imageobject></mediaobject> <para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist> <listitem> <para revision="1" xml:id="doPartitionDisks-pa4">使用现存的分区</para> - <para revision="1" xml:id="doPartitionDisks-pa5">若此选项可用，表面安装程序找到了现存的 Linux 分区，并且可以将其用于 Mageia 的安装。</para> + <para xml:id="doPartitionDisks-pa5" revision="1">若此选项可用，表面安装程序找到了现存的 Linux 分区，并且可以将其用于 Mageia 的安装。</para> </listitem> <listitem> - <para revision="1" xml:id="doPartitionDisks-pa6">使用空闲空间</para> + <para xml:id="doPartitionDisks-pa6" revision="1">使用空闲空间</para> - <para revision="1" xml:id="doPartitionDisks-pa7">若硬盘上有未使用的区域，此选项将会把 Mageia 安装到该区域中。</para> + <para xml:id="doPartitionDisks-pa7" revision="1">若硬盘上有未使用的区域，此选项将会把 Mageia 安装到该区域中。</para> </listitem> <listitem> - <para revision="1" xml:id="doPartitionDisks-pa8">使用 Windows 分区中的空闲空间</para> + <para xml:id="doPartitionDisks-pa8" revision="1">使用 Windows 分区中的空闲空间</para> - <para revision="1" xml:id="doPartitionDisks-pa9">若现存 Windows 分区中有空闲空间，安装程序将把 Mageia 安装在此处。</para> + <para xml:id="doPartitionDisks-pa9" revision="1">若现存 Windows 分区中有空闲空间，安装程序将把 Mageia 安装在此处。</para> <para xml:id="doPartitionDisks-pa10" revision="2">此选项可用于为 Mageia 腾出安装空间，但操作过程有一定风险。请您确保已经备份了所有重要文件！</para> - <para xml:id="doPartitionDisks-pa11" revision="3">将会缩小 Windows 分区的大小。该分区必须为“clean”状态，即上一次使用 Windows + <para revision="3" xml:id="doPartitionDisks-pa11">将会缩小 Windows 分区的大小。该分区必须为“clean”状态，即上一次使用 Windows 时必须正常地关机或重启。同时，该分区也应当进行碎片整理，即便不能将文件碎片完全移出待使用区域。我们推荐您对个人文件进行备份后再进行此操作。</para> <para>安装程序将用亮蓝色标记其余的 Windows 分区，用深蓝色标记将用于安装 Mageia @@ -47,22 +53,26 @@ <mediaobject> <imageobject> <imagedata fileref="dx2-doPartitionDisks2.png"/> </imageobject></mediaobject> + + <mediaobject> +<imageobject> <imagedata fileref="live-doPartitionDisks2.png"/> +</imageobject></mediaobject> </listitem> </itemizedlist> <itemizedlist> <listitem> - <para revision="1" xml:id="doPartitionDisks-pa12">擦除磁盘，并使用整个磁盘。</para> + <para xml:id="doPartitionDisks-pa12" revision="1">擦除磁盘，并使用整个磁盘。</para> - <para revision="1" xml:id="doPartitionDisks-pa13">此选项将会把整个硬盘空间用于安装 Mageia。</para> + <para xml:id="doPartitionDisks-pa13" revision="1">此选项将会把整个硬盘空间用于安装 Mageia。</para> - <para revision="1" xml:id="doPartitionDisks-pa14">注意！将会删除所选驱动器上的所有数据！请谨慎操作！</para> + <para xml:id="doPartitionDisks-pa14" revision="1">注意！将会删除所选驱动器上的所有数据！请谨慎操作！</para> - <para revision="1" xml:id="doPartitionDisks-pa15">若您需要将磁盘的一部分用于存储其他数据，或者您不希望驱动器上的数据丢失，请不要使用此选项。</para> + <para xml:id="doPartitionDisks-pa15" revision="1">若您需要将磁盘的一部分用于存储其他数据，或者您不希望驱动器上的数据丢失，请不要使用此选项。</para> </listitem> </itemizedlist><itemizedlist> <listitem> - <para revision="1" xml:id="doPartitionDisks-pa16">自定义</para> + <para xml:id="doPartitionDisks-pa16" revision="1">自定义</para> - <para revision="1" xml:id="doPartitionDisks-pa17">允许您完全控制系统在硬盘上的安装方式。</para> + <para xml:id="doPartitionDisks-pa17" revision="1">允许您完全控制系统在硬盘上的安装方式。</para> </listitem> </itemizedlist></para> @@ -100,6 +110,23 @@ <para>若您使用 UEFI 系统，将自动检测并创建 ESP（EFI 系统分区），之后将其挂载到 /boot/EFI。“自定义”选项仅用于检测该操作的结果是否正确</para> </note> + <note> + <para>若您使用传统的硬件（即 CSM 或 BIOS），并且使用 GPT 格式的硬盘分区，您需要先创建一个 BIOS 引导分区。该分区一般为 1 MiB +左右，且不会被挂载。请选择“自定义磁盘分区”，然后手动创建一个 BIOS 引导分区。</para> + + <mediaobject> +<imageobject> <imagedata fileref="dx2-doPartitionDisks3.png"/> +</imageobject></mediaobject> + + <mediaobject> +<imageobject> <imagedata fileref="live-doPartitionDisks3.png"/> +</imageobject></mediaobject> + + <mediaobject> +<imageobject> <imagedata fileref="dx2-doPartitionDisks4.png"/> +</imageobject></mediaobject> + </note> + <warning> <para>一些新式驱动器的逻辑扇区大小为 4096 字节，而非传统的 512 字节。此类硬件尚未被测试。此外，一些 SSD 驱动器的擦除块大小为 1MB。若您正在使用这类驱动器，我们建议您使用其他的分区工具（如gparted）预先进行分区操作：</para> diff --git a/docs/installer/zh_CN/exitInstall.xml b/docs/installer/zh_CN/exitInstall.xml index 5a29ee90..742ada5f 100644 --- a/docs/installer/zh_CN/exitInstall.xml +++ b/docs/installer/zh_CN/exitInstall.xml @@ -1,33 +1,22 @@ -<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="exitInstall" version="5.0" xml:lang="zh_CN"> - +<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="exitInstall" version="5.0" xml:lang="zh_CN"> <info> <title xml:id="exitInstall-ti1">恭喜</title> </info> - - - - - - <mediaobject> -<!-- 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"--> -<imageobject> <imagedata revision="1" fileref="dx2-exitInstall.png" -format="PNG" align="center" xml:id="exitInstall-im1"> </imagedata> -</imageobject></mediaobject> - <para revision="2" xml:id="exitInstall-pa1">您以完成安装和配置 Mageia，现在可以安全地移除安装介质并重新启动。</para> + <mediaobject> +<!-- Lebarhon 20170209 updated SC--> +<imageobject> <imagedata format="PNG" fileref="dx2-exitInstall.png" +align="center" revision="1" xml:id="exitInstall-im1"/> </imageobject></mediaobject> - <para revision="2" xml:id="exitInstall-pa2">重启之后，在引导界面可以看到操作系统选项（若您的计算机上有两个以上操作系统）。</para> + <para xml:id="exitInstall-pa1" revision="2">您以完成安装和配置 Mageia，现在可以安全地移除安装介质并重新启动。</para> - <para revision="1" xml:id="exitInstall-pa3">若您没有调整引导器的配置，将会自动启动 Mageia。 </para> - - <para revision="1" xml:id="exitInstall-pa4">Enjoy!</para> - - <para revision="1" xml:id="exitInstall-pa5">若您有任何疑问，或希望帮助完善 Mageia，请访问 www.mageia.org。 </para> - - + <para xml:id="exitInstall-pa2" revision="2">重启之后，在引导界面可以看到操作系统选项（若您的计算机上有两个以上操作系统）。</para> + + <para xml:id="exitInstall-pa3" revision="1">若您没有调整引导器的配置，将会自动启动 Mageia。</para> + + <para xml:id="exitInstall-pa4" revision="1">Enjoy!</para> + + <para xml:id="exitInstall-pa5" revision="1">若您有任何疑问，或希望帮助完善 Mageia，请访问 www.mageia.org。</para> </section>
\ No newline at end of file diff --git a/docs/installer/zh_CN/misc-params.xml b/docs/installer/zh_CN/misc-params.xml index c27f46f7..599c4313 100644 --- a/docs/installer/zh_CN/misc-params.xml +++ b/docs/installer/zh_CN/misc-params.xml @@ -1,51 +1,32 @@ -<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="misc-params" version="5.0" xml:lang="zh_CN"> +<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_CN" xml:id="misc-params"> <info> <title xml:id="misc-params-ti1">一些杂项</title> </info> - - - - - - - - - - - - - + <mediaobject> +<!-- Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC--> +<imageobject> <imagedata fileref="dx2-summaryTop.png"/> </imageobject></mediaobject> - + <para xml:id="misc-params-pa1" revision="1">DrakX 会根据您的选择以及检测到的硬件自动生成合适的配置。您可以在此处检查或更改它们（点击 <guibutton>配置</guibutton> +按钮）。</para> - + <note> + <para>一般而言，您可以直接使用推荐配置，除非您遇到以下三种情况：<itemizedlist> + <listitem> + <para>您预知该默认配置存在问题</para> + </listitem> - + <listitem> + <para>您尝试了默认配置，但安装失败</para> + </listitem> - - - <mediaobject> -<!-- 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--> -<imageobject> <imagedata fileref="dx2-summary.png" revision="1" -align="center" format="PNG" xml:id="summary-im1" /> </imageobject></mediaobject> - - <para revision="1" xml:id="misc-params-pa1">DrakX 会根据您的选择以及检测到的硬件自动生成合适的配置。您可以在此处检查或更改它们（点击 <guibutton>配置</guibutton> -按钮）。</para> + <listitem> + <para>后续章节中所提到的其他情况</para> + </listitem> + </itemizedlist></para> + </note> <section xml:id="misc-params-system"> <info> @@ -60,29 +41,29 @@ align="center" format="PNG" xml:id="summary-im1" /> </imageobject></mediaobject> </listitem> <listitem> - <para xml:id="misc-params-system-pa3" revision="1"><guilabel>国家/地区</guilabel></para> + <para revision="1" xml:id="misc-params-system-pa3"><guilabel>国家/地区</guilabel></para> - <para revision="1" xml:id="misc-params-system-pa3a">若您不在所选国家/地区中，请务必对其进行正确设置。参见 <xref linkend="selectCountry"/></para> + <para xml:id="misc-params-system-pa3a" revision="1">若您不在所选国家/地区中，请务必对其进行正确设置。参见 <xref linkend="selectCountry"/></para> </listitem> <listitem> - <para xml:id="misc-params-system-pa4" revision="1"><guilabel>引导器</guilabel></para> + <para revision="1" xml:id="misc-params-system-pa4"><guilabel>引导器</guilabel></para> - <para revision="2" xml:id="misc-params-system-pa4a">DrakX 为引导器进行了自动设置。</para> + <para xml:id="misc-params-system-pa4a" revision="2">DrakX 为引导器进行了自动设置。</para> - <para revision="2" xml:id="misc-params-system-pa4b">不更改任何选项，除非您懂得如何配置 GRUB 和/或 Lilo</para> + <para xml:id="misc-params-system-pa4b" revision="2">除非您懂得如何配置 GRUB 2，否则请勿更改这些配置</para> - <para revision="2" xml:id="misc-params-system-pa4c">更多信息，参见 <xref linkend="setupBootloader"/></para> + <para xml:id="misc-params-system-pa4c" revision="2">更多信息，参见 <xref linkend="setupBootloader"/></para> </listitem> <listitem> - <para revision="1" xml:id="misc-params-system-pa5"><guilabel>用户管理</guilabel></para> + <para xml:id="misc-params-system-pa5" revision="1"><guilabel>用户管理</guilabel></para> - <para revision="2" xml:id="misc-params-system-pa5a">您可以在此处添加额外的用户。将会为每个用户在 <literal>/home</literal> 下创建目录。</para> + <para xml:id="misc-params-system-pa5a" revision="2">您可以在此处添加额外的用户。将会为每个用户在 <literal>/home</literal> 下创建目录。</para> </listitem> <listitem> - <para revision="1" xml:id="misc-params-system-pa6"><guilabel>服务</guilabel>:</para> + <para xml:id="misc-params-system-pa6" revision="1"><guilabel>服务</guilabel>:</para> <para xml:id="misc-params-system-pa6a" revision="1">系统服务指在后台运行的小程序（守护进程）。此工具允许您启用或禁用特定任务。</para> @@ -100,36 +81,39 @@ align="center" format="PNG" xml:id="summary-im1" /> </imageobject></mediaobject> <itemizedlist> <listitem> - <para revision="1" xml:id="misc-params-hardware-pa1"><guilabel>键盘</guilabel>:</para> + <para xml:id="misc-params-hardware-pa1" revision="1"><guilabel>键盘</guilabel>:</para> <para xml:id="misc-params-hardware-pa1a" revision="1">在这里，您可以根据您所在的位置、使用的语言和键盘类型来设置键盘布局。</para> + + <note> + <para>如果您发现键盘布局错误、需要更正，请注意：在更改配置后，之前设置的密码也可能发生改变。</para> + </note> </listitem> <listitem> - <para revision="1" xml:id="misc-params-hardware-pa2"><guilabel>鼠标</guilabel>:</para> + <para xml:id="misc-params-hardware-pa2" revision="1"><guilabel>鼠标</guilabel>:</para> - <para revision="1" xml:id="misc-params-hardware-pa2a">您可以添加或配置其他触控设备、平板、轨迹球等。</para> + <para xml:id="misc-params-hardware-pa2a" revision="1">您可以添加或配置其他触控设备、平板、轨迹球等。</para> </listitem> <listitem> - <para revision="1" xml:id="misc-params-hardware-pa3"><guilabel>声卡</guilabel>:</para> + <para xml:id="misc-params-hardware-pa3" revision="1"><guilabel>声卡</guilabel>:</para> - <para revision="1" xml:id="misc-params-hardware-pa3a">安装器将会使用默认驱动（如果有的话）。只有存在多个可用驱动（且均不是默认驱动）时，才会提示您进行选择。</para> + <para xml:id="misc-params-hardware-pa3a" revision="1">安装器将会使用默认驱动（如果有的话）。只有存在多个可用驱动（且均不是默认驱动）时，才会提示您进行选择。</para> </listitem> <listitem> <para xml:id="misc-params-hardware-pa4" revision="1"><guilabel>图形界面</guilabel>:</para> - <para revision="1" xml:id="misc-params-hardware-pa4a">您可以在这里配置显卡和显示器。</para> + <para xml:id="misc-params-hardware-pa4a" revision="1">您可以在这里配置显卡和显示器。</para> - <para revision="1" xml:id="misc-params-hardware-pa4b">更多信息，参见 <xref linkend="configureX_chooser"/>.</para> + <para xml:id="misc-params-hardware-pa4b" revision="1">更多信息，参见 <xref linkend="configureX_chooser"/>.</para> </listitem> </itemizedlist> <mediaobject> -<imageobject> <imagedata xml:id="summaryBottom-im1" revision="1" -align="center" format="PNG" fileref="dx2-summaryBottom.png" /> -</imageobject></mediaobject> +<imageobject> <imagedata format="PNG" xml:id="summaryBottom-im1" +align="center" fileref="dx2-summaryBottom.png" revision="1"/> </imageobject></mediaobject> </section> <section xml:id="misc-params-network"> @@ -139,7 +123,7 @@ align="center" format="PNG" fileref="dx2-summaryBottom.png" /> <itemizedlist> <listitem> - <para revision="1" xml:id="misc-params-network-pa1"><guilabel>网络</guilabel>:</para> + <para xml:id="misc-params-network-pa1" revision="1"><guilabel>网络</guilabel>:</para> <para xml:id="misc-params-network-pa2" revision="1">您可以在这里配置网络。若您需要在网卡上使用非自由的驱动程序，并且尚未启用 Nonfree 软件仓库，那么您最好等到重启后再进行这一操作。</para> @@ -153,7 +137,7 @@ align="center" format="PNG" fileref="dx2-summaryBottom.png" /> <para xml:id="misc-params-network-pa4a" revision="1">代理服务器将作为您的电脑和广域网之间的桥梁。您可以在此处配置您需要使用的代理服务。</para> - <para revision="1" xml:id="misc-params-network-pa4b">您可能需要咨询系统管理员来获取此处应当填写的参数</para> + <para xml:id="misc-params-network-pa4b" revision="1">您可能需要咨询系统管理员来获取此处应当填写的参数</para> </listitem> </itemizedlist> </section> @@ -165,24 +149,24 @@ align="center" format="PNG" fileref="dx2-summaryBottom.png" /> <itemizedlist> <listitem> - <para xml:id="misc-params-security-pa1" revision="1"><guilabel>安全等级</guilabel>：</para> + <para revision="1" xml:id="misc-params-security-pa1"><guilabel>安全等级</guilabel>：</para> - <para revision="1" xml:id="misc-params-security-pa1a">您可以在这里设置计算机的安全等级，一般情况下可以使用默认设置（标准）。</para> + <para xml:id="misc-params-security-pa1a" revision="1">您可以在这里设置计算机的安全等级，一般情况下可以使用默认设置（标准）。</para> - <para revision="1" xml:id="misc-params-security-pa1b">请勾选您认为合适的选项。</para> + <para xml:id="misc-params-security-pa1b" revision="1">请勾选您认为合适的选项。</para> </listitem> <listitem> <para xml:id="misc-params-security-pa2" revision="1"><guilabel>防火墙</guilabel>：</para> - <para xml:id="misc-params-security-pa2a" revision="1">防火墙将保护您的重要数据，以免其被他人恶意利用或窃取。</para> + <para revision="1" xml:id="misc-params-security-pa2a">防火墙将保护您的重要数据，以免其被他人恶意利用或窃取。</para> - <para revision="1" xml:id="misc-params-security-pa2b">请选择允许访问本系统的服务。您的选项应当基于计算机的期望用途。</para> + <para xml:id="misc-params-security-pa2b" revision="1">选择您需要使用的服务，这取决与您希望如何使用您的计算机。有关更多信息，请参见 <xref linkend="firewall"/>。</para> <warning> - <para revision="1" xml:id="misc-params-security-pa2c">请牢记：允许所有服务（即不启用防火墙）是非常危险的。</para> + <para xml:id="misc-params-security-pa2c" revision="1">请牢记：允许所有服务（即不启用防火墙）是非常危险的。</para> </warning> </listitem> </itemizedlist> </section> -</section> +</section>
\ No newline at end of file diff --git a/docs/installer/zh_CN/reboot.xml b/docs/installer/zh_CN/reboot.xml index 8d07ae86..41fb9a1c 100644 --- a/docs/installer/zh_CN/reboot.xml +++ b/docs/installer/zh_CN/reboot.xml @@ -1,18 +1,22 @@ -<?xml version="1.0" encoding="utf-8"?> -<section version="5.0" xml:lang="zh_CN" xml:id="reboot" xmlns="http://docbook.org/ns/docbook" - xmlns:ns6="http://www.w3.org/1999/xlink" - xmlns:ns5="http://www.w3.org/1999/xhtml" - xmlns:ns4="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1998/Math/MathML" - xmlns:ns="http://docbook.org/ns/docbook"> - <info> +<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_CN" xml:id="reboot"> + <!--Lebarhon 20170210 updated for Mageia6--> +<info> <title xml:id="reboot-ti1">重新启动</title> </info> - <mediaobject condition="live"> -<imageobject> <imagedata align="center" fileref="live-reboot.png" -format="PNG" revision="1" xml:id="reboot-im1"/> </imageobject></mediaobject> - <para>在安装了引导起之后，程序将提示您关闭计算机，移除 Live CD -并重启计算机。重启后，您将会看到一个下载进度条，它将提示您正在下载的软件媒体（参见“软件管理”）。</para> -</section> + + + <para>一旦安装了引导器，安装程序将会提示您重启电脑，此时请移除 Live CD +并重启。请点击<guibutton>完成</guibutton></emphasis>并<emphasis +role="bold">根据提示的步骤</emphasis>进行操作。</para> + + <mediaobject> +<imageobject> <imagedata fileref="live-reboot2.png"/> </imageobject></mediaobject> + + <para>重启后，您将会看到一系列下载进度条，它将提示您正在下载的软件媒体（参见“软件管理”）。</para> + + <mediaobject condition="live"> +<imageobject> <imagedata format="PNG" xml:id="reboot-im1" +fileref="live-reboot.png" align="center" revision="1"/> </imageobject></mediaobject> +</section>
\ No newline at end of file diff --git a/docs/installer/zh_CN/selectCountry.xml b/docs/installer/zh_CN/selectCountry.xml index 02266915..320b9472 100644 --- a/docs/installer/zh_CN/selectCountry.xml +++ b/docs/installer/zh_CN/selectCountry.xml @@ -1,53 +1,36 @@ -<?xml version="1.0" encoding="utf-8"?> -<section xmlns="http://docbook.org/ns/docbook" - xmlns:ns5="http://www.w3.org/1998/Math/MathML" - xmlns:ns4="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1999/xhtml" - xmlns:ns2="http://www.w3.org/1999/xlink" - xmlns:ns="http://docbook.org/ns/docbook" - xml:id="selectCountry" version="5.0" xml:lang="zh_CN"> +<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" version="5.0" xml:lang="zh_CN"> + <info> + <title xml:id="selectCountry-ti1">选择您所在的国家/地区</title> + </info> + + <mediaobject> +<!-- Lebarhon 2016 12 16 updated for Mageia 6--> +<imageobject> <imagedata format="PNG" xml:id="selectCountry-im1" +align="center" fileref="dx2-selectCountry.png" revision="1"/> </imageobject></mediaobject> - <info> - <title xml:id="selectCountry-ti1">选择您所在的国家/地区</title> - </info> - - - - -<mediaobject> -<!-- 2012-12-25 marja - moved this section out of misc-params --> -<!-- 2013-05-05 marja - added screenshot --> -<imageobject> <imagedata revision="1" fileref="dx2-selectCountry.png" -align="center" format="PNG" xml:id="selectCountry-im1"></imagedata> -</imageobject></mediaobject> + <para revision="2" xml:id="selectCountry-pa1">请选择您所在的国家或地区。此选项将影响货币设置和无线管理域设置。如果您设置了错误的国家，您可能无法正常使用无线网络。</para> + <para revision="1" xml:id="selectCountry-pa2">若列表中不包含您的国家，请点击 <guilabel>其他国家</guilabel> 按钮并选择相应的国家/区域。</para> - <para revision="2" xml:id="selectCountry-pa1">请选择您所在的国家或地区。此选项将影响货币设置和无线管理域设置。如果您设置了错误的国家，您可能无法正常使用无线网络。</para> - - <para revision="1" xml:id="selectCountry-pa2">若列表中不包含您的国家，请点击 <guilabel>其他国家</guilabel> 按钮并选择相应的国家/区域。</para> - - <note> - <para revision="1" xml:id="selectCountry-pa3">若您的国家仅在 <guilabel>其他国家</guilabel> 列表中列出，在点击 <guibutton>确定</guibutton> + <note> + <para revision="1" xml:id="selectCountry-pa3">若您的国家仅在 <guilabel>其他国家</guilabel> 列表中列出，在点击 <guibutton>确定</guibutton> 按钮之后，请忽略前一个列表中的选项。DrakX 会应用您后来的选择。</para> - </note> - - <section xml:id="inputMethod"> + </note> - <info> - <title xml:id="inputMethod-ti7">输入法</title> - </info> + <section xml:id="inputMethod"> + <info> + <title xml:id="inputMethod-ti7">输入法</title> + </info> - <para revision="1" xml:id="selectCountry-pa4">在 <guilabel>其他国家</guilabel> -窗口中，您也可以选择一种输入法（位于列表底部）。输入法用于输入各类语言中的字符（中文、日文、韩文等）。IBus 是 Mageia -DVD、Africa/India 和 Asia/no-India 的默认选项。对于亚洲和非洲区域设置，安装程序会自动选择 IBus -作为默认输入法，因此用户无需手动配置。其他输入法（SCIM、GCIN、HIME 等）可以提供类似的功能，您可以在选择软件包前通过添加 HTTP/FTP + <para xml:id="selectCountry-pa4" revision="1">在 <guilabel>其他国家</guilabel> +窗口中，您也可以选择一种输入法（位于列表底部）。输入法用于输入各类语言中的字符（中文、日文、韩文等）。IBus +是默认选项，一般情况下用户无需手动配置。其他输入法（SCIM、GCIN、HIME 等）可以提供类似的功能，您可以在选择软件包前通过添加 HTTP/FTP 媒体来安装它们。</para> - <note> - <para revision="1" xml:id="selectCountry-pa5">若您在安装期间缺少输入法，您可以在安装完成后通过“配置我的电脑”->“系统”设置来安装输入法，或者以 root 身份运行 localedrake。</para> - </note> - </section> + <note> + <para xml:id="selectCountry-pa5" revision="1">若您在安装期间缺少输入法，您可以在安装完成后通过“配置我的电脑”->“系统”设置来安装输入法，或者以 root 身份运行 localedrake。</para> + </note> </section> - +</section>
\ No newline at end of file diff --git a/docs/installer/zh_CN/setupBootloader.xml b/docs/installer/zh_CN/setupBootloader.xml index 75dea51a..16c9e18e 100644 --- a/docs/installer/zh_CN/setupBootloader.xml +++ b/docs/installer/zh_CN/setupBootloader.xml @@ -5,92 +5,204 @@ <info> <!----> -<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page--> +<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page + +Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC--> <title xml:id="setupBootloader-ti1">引导程序的主要选项</title> </info> - <mediaobject> -<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></mediaobject> - <section> - <title>使用 BIOS 系统</title> + <title>引导器界面</title> - <para xml:id="setupBootloader-pa1" revision="4">若您希望修改安装程序默认选择的引导器设置，可以在这里进行更改。</para> + <para>默认情况下，Mageia 仅使用：</para> - <para xml:id="setupBootloader-pa2" revision="4">您可能同时在电脑上安装了其他系统，这种情况下您需要将 Mageia 添加到现存引导器，或让 Mageia 创建一个新的起动器。</para> + <itemizedlist> + <listitem> + <para>GRUB2（包含/不包含图形界面），当使用传统硬件 + MBR/GPT格式分区时</para> + </listitem> + + <listitem> + <para>GRUB2-efi，当使用 UEFI 硬件时。</para> + </listitem> + </itemizedlist> <tip> <para>Mageia 的图形化菜单：</para> </tip> - <section xml:id="usingMageiaBootloader"> - <info> - <title xml:id="usingMageiaBootloader-ti2">使用 Mageia 提供的引导器</title> - </info> - - <para xml:id="setupBootloader-pa4" revision="3">默认情况下将新的 GRUB（传统版）引导器写入到第一硬盘驱动器的 MBR（主引导记录）中。如果您已经安装了其他系统，Mageia -会尝试将其添加到新的引导菜单中。</para> + <section> + <title>GRUB2，当使用传统硬件 + MBR/GPT 格式分区时</title> - <para revision="3">除了 GRUB 传统版和 Lilo，Mageia 目前也提供 GRUB2 作为可选的引导器，</para> + <mediaobject> +<imageobject> <imagedata fileref="dx2-setupBootloader.png"/> </imageobject></mediaobject> - <warning> - <para xml:id="setupBootloader-pa6" revision="3">当前，GRUB（传统版，默认选项）无法识别和支持使用 GRUB2 作为引导器的 Linux 系统。</para> + <mediaobject> +<imageobject> <imagedata xml:id="setupBootloader-im1" +fileref="live-setupBootloader.png"/> </imageobject></mediaobject> - <para revision="3">最好的解决方法是使用 GRUB 2 引导器，可以在安装过程中的摘要页面中选择安装。</para> - </warning> + <para>若您不确定如何操作，请不要修改“引导设备”。</para> </section> - <section xml:id="usingExistingBootloader"> - <info> - <title xml:id="usingExistingBootloader-ti4" revision="2">使用现存的引导器</title> - </info> + <section> + <title>GRUB2-efi，当使用 UEFI 硬件时</title> - <para xml:id="setupBootloader-pa46" revision="3">若您要使用现存的引导器，请记得在安装过程中的摘要页面处停留，然后点击引导器 <guibutton>配置</guibutton> -按钮，并改变引导器的安装位置。</para> + <para>对于 UEFI，用户界面会稍有不同，您将无法选择引导器（因为只能使用 Grub2-efi）。</para> - <para xml:id="setupBootloader-pa47" revision="1">请不要选择类似“sda”的设备，否则会覆盖现存的 MBR。您必须选择根分区（在之前的分区操作中设置）作为安装对象</para> + <mediaobject> +<imageobject> <imagedata fileref="dx2-setupBootloader2.png"/> </imageobject></mediaobject> - <para xml:id="setupBootloader-pa48" revision="1">要清楚，sda 代表一个设备（磁盘），sda7 代表设备上的分区。</para> + <mediaobject> +<imageobject> <imagedata fileref="live-setupBootloader2.png"/> +</imageobject></mediaobject> - <tip> - <para revision="1" xml:id="setupBootloader-pa48a">可以按下 Ctrl+Alt+F2 来转到 tty2，然后输入 <literal>df</literal> 来查看 -<literal>/</literal>（根分区）对应的分区编号。然后按下 Ctrl+Alt+F7 返回安装界面。</para> - </tip> + <para>如果 Mageia 是您在电脑上安装的第一个系统，安装程序将自动创建一个 ESP（EFI 系统分区）来容纳引导器（Grub2-efi）。如果已安装了其他 +UEFI 操作系统（例如 Windows 8），Mageia 安装器将会探测现存的（由 Windows 创建的） ESP，并添加 +grub2-efi。尽管多个 ESP 可以共存，但只需一个 ESP 即可满足启动所有操作系统的需求。</para> - <para xml:id="setupBootloader-pa49" revision="2">有关添加 Mageia -系统至现存引导器的问题超出了此帮助的范围。多数情况下，这设计到运行相应的引导器安装程序，并自动检测和添加引导项。请参见有关操作系统的文档以便进一步操作。</para> + <para>若您不确定如何操作，请不要修改“引导设备”。</para> </section> + </section> - <section xml:id="advancedOptionBootloader"> - <info> - <title xml:id="advancedOptionBootloader-ti5" revision="2">引导器高级选项</title> - </info> + <section> + <title xml:id="setupMageiaBootloader">使用 Mageia 提供的引导器</title> - <para xml:id="setupBootloader-pa52" revision="3">如果您的 <literal>/</literal> 分区对于 <literal>/tmp</literal> 来说太小，请点击 -<guibutton>Advanced</guibutton>，然后勾选 <guilabel>每次启动时清理 -/tmp</guilabel>。这有助于维持一定的空闲空间。</para> - </section> + <para>默认情况下，根据您的硬件情况，Mageia 会将：</para> + + <itemizedlist> + <listitem> + <para>GRUB 2 引导器安装至 MBR（主引导记录）区域或第一硬盘的 BIOS 引导分区。</para> + </listitem> + + <listitem> + <para>GRUB2-efi 引导器安装至 ESP</para> + </listitem> + </itemizedlist> + + <para>若您已安装了其他操作系统，Mageia 会尝试将它们也添加到 Mageia 的引导菜单。如果您不希望 Mageia +这么做，请点击<guibutton>下一步</guibutton>，然后取消勾选<guilabel>检测其他操作系统</guilabel></para> + + <mediaobject> +<imageobject> <imagedata fileref="dx2-setupBootloader3.png"/> </imageobject></mediaobject> + + <mediaobject> +<imageobject> <imagedata fileref="live-setupBootloader3.png"/> +</imageobject></mediaobject> </section> <section> - <title>使用 UEFI 系统</title> + <title>使用现存的引导器</title> + + <para>有关添加 Mageia +系统至现存引导器的问题超出了此帮助的范围。多数情况下，这设计到运行相应的引导器安装程序，并自动检测和添加引导项。请参见有关操作系统的文档以便进一步操作。</para> + </section> - <para>对于 UEFI，用户界面会稍有不同，您将无法选择引导器（因为只能使用 Grub2-efi）。 </para> + <section> + <title xml:id="setupChainLoading">使用链式加载（chain loading）</title> + + <para>若您不需要 Mageia 安装引导器，而是希望从其他系统引导 +Mageia，请点击<guibutton>下一步</guibutton>，然后点击<guibutton>高级</guibutton>并勾选 +<guilabel>不要修改 ESP 或 MBR</guilabel>。</para> + + <mediaobject> +<imageobject> <imagedata fileref="dx2-setupBootloader4.png"/> </imageobject></mediaobject> <mediaobject> -<imageobject condition="classical"> <imagedata -fileref="dx2-setupBootloader2.png"/> </imageobject> <imageobject -condition="live"> <imagedata fileref="live-setupBootloader2.png"/> +<imageobject> <imagedata fileref="live-setupBootloader4.png"/> </imageobject></mediaobject> - <para>如果 Mageia 是您在电脑上安装的第一个系统，安装程序将自动创建一个 ESP（EFI 系统分区）来容纳引导器（Grub2-efi）。如果已安装了其他 -UEFI 操作系统（例如 Windows 8），Mageia 安装器将会探测现存的（由 Windows 创建的） ESP，并添加 -grub2-efi。尽管多个 ESP 可以共存，但只需一个 ESP 即可满足启动所有操作系统的需求。</para> + <para>安装程序将会提醒您缺少引导器，请忽略它并点击<guibutton>确定</guibutton>。</para> + + <mediaobject> +<imageobject> <imagedata fileref="dx2-setupBootloader5.png"/> </imageobject></mediaobject> + </section> - <para>若您不确定如何操作，请不要修改“引导设备”。</para> + <section> + <title>选项</title> + + <section> + <title>第一页</title> + + <para><itemizedlist> + <listitem> + <para><guilabel>自动引导之前等待</guilabel>：此文本框用于设置在等待多少秒之后自动进入默认选定的操作系统。</para> + </listitem> + + <listitem> + <para><guilabel>安全</guilabel>：用于设置引导器的密码。可以防止其他人进入单用户模式，或者修改引导参数。</para> + </listitem> + + <listitem> + <para><guilabel>密码</guilabel>：此文本框用于输入密码</para> + </listitem> + + <listitem> + <para><guilabel>确认密码</guilabel>：再次输入密码，安装程序将检查您两次输入的密码是否一致。</para> + </listitem> + + <listitem> + <para><guilabel>高级</guilabel></para> + + <itemizedlist> + <listitem> + <para><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).</para> + </listitem> + + <listitem> + <para><guilabel>Enable SMP</guilabel>: This option enables / disables symmetric +multiprocessing for multi core processors.</para> + </listitem> + + <listitem> + <para><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.</para> + </listitem> + + <listitem> + <para><guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which +manage all external interrupts for some specific processor in an SMP system.</para> + </listitem> + </itemizedlist> + </listitem> + </itemizedlist></para> + </section> + + <section> + <title>下一页</title> + + <itemizedlist> + <listitem> + <para><guilabel>默认</guilabel>：使用默认引导参数</para> + </listitem> + + <listitem> + <para><guilabel>追加</guilabel> ：用于在默认引导选项后添加额外所需的内核参数。</para> + </listitem> + + <listitem> + <para><guilabel>探测其他系统</guilabel>：参见<link linkend="setupMageiaBootloader">使用 +Mageia 引导器</link></para> + </listitem> + + <listitem> + <para><guilabel>高级</guilabel><itemizedlist> + <listitem> + <para><guilabel>图像模式</guilabel>：用于设定显示引导菜单时的屏幕分辨率和色彩深度。若要从可用的模式中进行选择，请点击下三角标记。</para> + </listitem> + + <listitem> + <para><emphasis role="bold">不要修改 ESP 或 MBR</emphasis>：参见<link +linkend="setupChainLoading">使用链式加载</link></para> + </listitem> + </itemizedlist></para> + </listitem> + </itemizedlist> + </section> </section> </section>
\ No newline at end of file diff --git a/docs/installer/zh_CN/setupBootloaderAddEntry.xml b/docs/installer/zh_CN/setupBootloaderAddEntry.xml index d4e61dc7..74aa0b48 100644 --- a/docs/installer/zh_CN/setupBootloaderAddEntry.xml +++ b/docs/installer/zh_CN/setupBootloaderAddEntry.xml @@ -2,56 +2,17 @@ <info> - <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page--> + <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page + +Lebarhon 2016 12 16 Updated for Mageia 6--> <title xml:id="setupBootloaderAddEntry-ti1">添加或修改引导菜单项</title> </info> - <mediaobject> -<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></mediaobject> - - <section> - <title>使用 BIOS 系统</title> - - <para>您可以添加项，或者修改您已选中的项，方法是在<emphasis>引导器配置</emphasis>界面按下相应键，并在弹出的编辑界面中进行操作。</para> - - <note> - <para>若您选择了 <code>Grub 2</code> 作为引导器，您将无法在这里使用工具编辑引导项，请点击“下一步”继续。您需要之后手动编辑 -<code>/boot/grub2/custom.cfg</code> 或使用 <code>grub-customizer</code> 来编辑。</para> - </note> - - <mediaobject> -<imageobject> <imagedata format="PNG" xml:id="setupBootloaderAddEntry-im1" -align="center" fileref="dx2-setupBootloaderAddEntry.png" revision="1"/> -</imageobject></mediaobject> - - <para>部分操作，例如改变引导项标题，或设置默认选项，是没有风险的。</para> - - <para>您可以为某一项添加版本号，或者完全删除它。</para> - - <para>若您在引导时未进行选择，则会进入默认引导项对应的系统。</para> - - <warning> - <para>编辑其他内容可能导致系统无法引导。请不要在不了解的情况下进行修改。</para> - </warning> - </section> - - <section> - <title>使用 UEFI 系统</title> - - <para>这种情况下，您将使用 Grub2-efi 进行引导，并且无法在这里使用工具进行编辑。您需要在安装后手动修改 -<code>/boot/grub2/custom.cfg</code>，或使用 <code>grub-customizer</code> -来进行编辑。此处您只能选择默认引导项。</para> - - <para>在点击 <guibutton>下一步</guibutton> 按钮之后，您将会看到另一个下拉列表，可以用它来选择 GRUB2 引导器的屏幕分辨率。</para> + <para>为此，您需要手动编辑 /boot/grub2/custom.cfg，或者使用 grub-customizer（可以从 Mageia +仓库中安装）来编辑引导项。</para> - <mediaobject> -<imageobject> <imagedata fileref="dx2-bootloaderConfiguration2.png"/> -</imageobject></mediaobject> - </section> + <note> + <para>有关更多信息，请参考我们的 wiki：<link +ns2:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para> + </note> </section>
\ No newline at end of file diff --git a/docs/installer/zh_CN/soundConfig.xml b/docs/installer/zh_CN/soundConfig.xml index 0c6837b9..13a099ff 100644 --- a/docs/installer/zh_CN/soundConfig.xml +++ b/docs/installer/zh_CN/soundConfig.xml @@ -1,12 +1,4 @@ -<?xml version='1.0' encoding='utf-8'?> -<section xmlns="http://docbook.org/ns/docbook" - xmlns:ns5="http://www.w3.org/1998/Math/MathML" - xmlns:ns4="http://www.w3.org/2000/svg" - xmlns:ns3="http://www.w3.org/1999/xhtml" - xmlns:ns2="http://www.w3.org/1999/xlink" - xmlns:ns="http://docbook.org/ns/docbook" - xml:id="soundConfig" version="5.0" xml:lang="zh_CN"> - +<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="soundConfig" version="5.0" xml:lang="zh_CN"> <info> <title xml:id="soundConfig-ti1">声音配置</title> </info> @@ -14,29 +6,25 @@ <mediaobject> -<!-- Started by marja on 2013-12-07 --> -<imageobject> <imagedata fileref="dx2-soundConfig.png" revision="1" -format="PNG" xml:id="soundConfig-im1" /> </imageobject></mediaobject> +<!-- Lebarhon 20170209 updated SC--> +<imageobject> <imagedata format="PNG" fileref="dx2-soundConfig.png" +xml:id="soundConfig-im1" revision="1"/> </imageobject></mediaobject> + + <para>这一界面中列出了安装程序为声卡选定的驱动，如果有默认驱动则将其作为默认配置。</para> - <para>这一界面中列出了安装程序为声卡选定的驱动，如果有默认驱动则将其作为默认配置。 - </para> <para>默认驱动通常不会出问题。不过，如果您在安装后遇到问题，请运行 <command>draksound</command>，或通过 MCC（Mageia -控制中心）中<guilabel>硬件</guilabel>选项卡中的<guilabel>声音配置</guilabel>来启动 draksound。 - </para> +控制中心）中<guilabel>硬件</guilabel>选项卡中的<guilabel>声音配置</guilabel>来启动 draksound。</para> + <para>在 draksound -或“声音配置”工具界面，点击<guibutton>高级</guibutton>、<guibutton>故障排除</guibutton>来查看解决问题的建议。 - </para> +或“声音配置”工具界面，点击<guibutton>高级</guibutton>、<guibutton>故障排除</guibutton>来查看解决问题的建议。</para> <section xml:id="soundConfig-Advanced"> <info> <title xml:id="soundConfig-Advanced-ti1">高级</title> </info> - <para>若没有默认驱动，或者默认驱动选择错误，则可以安装时点击此界面中的<guibutton>Advanced</guibutton>来更正。 - </para> - - <para>`在这种情况下，您可以在点击<guibutton>让我选择任意驱动</guibutton>来选择其他驱动程序。 - </para> + <para>若没有默认驱动，或者默认驱动选择错误，则可以安装时点击此界面中的<guibutton>Advanced</guibutton>来更正。</para> + <para>`在这种情况下，您可以在点击<guibutton>让我选择任意驱动</guibutton>来选择其他驱动程序。</para> </section> -</section> +</section>
\ No newline at end of file diff --git a/docs/installer/zh_CN/uninstall-Mageia.xml b/docs/installer/zh_CN/uninstall-Mageia.xml index e2cdd1e3..80618127 100644 --- a/docs/installer/zh_CN/uninstall-Mageia.xml +++ b/docs/installer/zh_CN/uninstall-Mageia.xml @@ -1,5 +1,6 @@ -<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_CN" xml:id="uninstall-Mageia"> - <!--Lebarhon 2015-07-06 Not true with UEFI --> +<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="uninstall-Mageia" version="5.0" xml:lang="zh_CN"> + <!--Lebarhon 2015-07-06 Not true with UEFI +Lebarhon 2016 12 16 this page should be deleted or rewritten.--> <info> <title xml:id="uninstall-Mageia-ti1">卸载Mageia</title> </info> |