diff options
| author | Yuri Chornoivan <yurchor@ukr.net> | 2018-12-12 08:40:04 +0200 |
|---|---|---|
| committer | Yuri Chornoivan <yurchor@ukr.net> | 2018-12-12 08:40:04 +0200 |
| commit | b13cf175f3051ed2e725fe09f589b9a8b62bac4a (patch) | |
| tree | 5c0f99819da738831289507ae8774d89cd840aa6 /docs/docs/stable/installer/zh_CN | |
| parent | add36fc2d1f26d91bd2c4878ff4802269b8a5ee9 (diff) | |
| download | tools-b13cf175f3051ed2e725fe09f589b9a8b62bac4a.tar tools-b13cf175f3051ed2e725fe09f589b9a8b62bac4a.tar.gz tools-b13cf175f3051ed2e725fe09f589b9a8b62bac4a.tar.bz2 tools-b13cf175f3051ed2e725fe09f589b9a8b62bac4a.tar.xz tools-b13cf175f3051ed2e725fe09f589b9a8b62bac4a.zip | |
Update Chinese (Traditional) translation
Diffstat (limited to 'docs/docs/stable/installer/zh_CN')
34 files changed, 1035 insertions, 707 deletions
diff --git a/docs/docs/stable/installer/zh_CN/SelectAndUseISOs2.xml b/docs/docs/stable/installer/zh_CN/SelectAndUseISOs2.xml index 7ff0e307..8d8a1e61 100644 --- a/docs/docs/stable/installer/zh_CN/SelectAndUseISOs2.xml +++ b/docs/docs/stable/installer/zh_CN/SelectAndUseISOs2.xml @@ -8,14 +8,21 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about </info> <section> <title>简介</title> - <para>Mageia 通过 ISO 镜像进行分发。此页将帮助您选择所需的镜像。</para> - <para>有两种类型的媒介：</para> + <para>Mageia is distributed via ISO images. This page will help you to choose +which image best suits your needs.</para> + <para>There are two families of media:</para> <itemizedlist> <listitem> - <para>传统安装器：在引导之后，程序将提供一系列用于安装和配置目标系统的选项。这种安装类型可以给予您最大限度的灵活性，尤其是选择所需安装的桌面环境。</para> + <para>Classical installer: Booting with this media provides you with the maximum +flexibility when choosing what to install, and for configuring your +system. In particular, you have a choice of which Desktop environment to +install</para> </listitem> <listitem> - <para>Live 媒介：您无需实际安装即可实际体验 Mageia 系统，以便确定系统被安装之后的模样。这种安装的过程更加简单，但您可做的选择也相应减少。</para> + <para>LIVE media: This option allows you to try out Mageia without having to +actually install it, or make any changes to your computer. If the +installation is decided, the process is simpler, but you get fewer choices +than offered by the Classical installer</para> </listitem> </itemizedlist> <para>下一节中将涉及有关细节。</para> @@ -24,8 +31,11 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about <title>介质</title> <section> <title>定义</title> - <para>媒介：是一类承载 ISO 文件、可以用于安装和/或更新 Mageia 的任意物理介质。</para> - <para>您可以在<link ns4:href="http://www.mageia.org/en/downloads/">这里</link>找到它们。</para> + <para>Here, a medium (plural: media) is an ISO image file that allows you to +install and/or update Mageia and by extension any physical support (DVD, USB +stick, ...) the ISO file is copied to.</para> + <para>You can find Mageia ISO's <link +ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para> </section> <section> <title>传统安装媒介</title> @@ -33,13 +43,14 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about <title>通用特性</title> <itemizedlist> <listitem> - <para>这些 ISO 使用传统的安装器（drakx）。</para> + <para>These ISOs use the Classical installer called drakx.</para> </listitem> <listitem> - <para>它们可以用于全新安装，或更新之前的版本。</para> + <para>They are used for performing clean installs or to upgrade a previously +installed version of Mageia.</para> </listitem> <listitem> - <para>媒介有 32 位和 64 位两种架构之分。</para> + <para>Different media for 32 and 64 bit architectures.</para> </listitem> <listitem> <para>欢迎屏幕中列出了一些可用的工具，如：救援系统、内存测试、硬件检测工具。</para> @@ -59,16 +70,19 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about <title>通用特性</title> <itemizedlist> <listitem> - <para>可以用于预览该发行版，而无需将其安装到硬盘上。也可以用于安装 Mageia 至硬盘。</para> + <para>Can be used to preview the Mageia operating system without having to install +it. Can also be used to install Mageia if you wish.</para> </listitem> <listitem> <para>每个 ISO 仅包含一种桌面环境（KDE Plasma、GNOME 或 Xfce）。</para> </listitem> <listitem> - <para>媒介有 32 位和 64 位两种架构之分。</para> + <para>Different media for 32 and 64 bit architectures.</para> </listitem> <listitem> - <para><emphasis role="bold">Live ISO 仅能用于全新安装，而无法对之前的版本进行升级。</emphasis></para> + <para><emphasis role="bold">Live ISOs can only be used to create clean +installations, they cannot be used to upgrade previously installed Mageia +releases.</emphasis></para> </listitem> <listitem> <para>其中包含非自由软件。</para> @@ -82,7 +96,7 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about <para>仅包含 KDE（Plasma）桌面环境。</para> </listitem> <listitem> - <para>包含所有语言支持。</para> + <para>All available languages are present.</para> </listitem> <listitem> <para>仅支持 64 位处理器。</para> @@ -96,7 +110,7 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about <para>仅包含 GNOME 桌面环境。</para> </listitem> <listitem> - <para>包含所有语言支持。</para> + <para>All available languages are present.</para> </listitem> <listitem> <para>仅支持 64 位处理器</para> @@ -110,7 +124,7 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about <para>仅包含 Xfce 桌面环境。</para> </listitem> <listitem> - <para>包含所有语言支持。</para> + <para>All available languages are present.</para> </listitem> <listitem> <para>同时支持 32 位和 64 位处理器。</para> @@ -119,22 +133,27 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about </section> </section> <section> - <title>仅用于引导的 CD</title> + <title>Net install media</title> <section> <title>通用特性</title> <itemizedlist> <listitem> - <para>此类媒介仅包含启动 drakx 安装器和查找 drakx-installer-stage2 -等软件包所必须的程序，因此非常轻巧。用于后续安装的软件包可以位于电脑硬盘、本地驱动器、本地网络或互联网。</para> + <para>These are minimal ISO's containing no more than that which is needed to +start the drakx installer and find drakx-installer-stage2 and other packages +that are needed to continue and complete the install. These packages may be +on the PC hard disk, on a local drive, on a local network or on the +Internet.</para> </listitem> <listitem> - <para>这类媒介非常小巧（小于 100 MB），适用于不方便下载完整版 DVD、没有 DVD 驱动器或不支持 USB 引导的电脑。</para> + <para>These media are very light (less than 100 MB) and are convenient if +bandwidth is too low to download a full DVD, or if you have a PC without a +DVD drive or is unable to boot from a USB stick.</para> </listitem> <listitem> - <para>媒介有 32 位和 64 位两种架构之分。</para> + <para>Different media for 32 and 64 bit architectures.</para> </listitem> <listitem> - <para>仅包含英语支持。</para> + <para>First steps are English language only.</para> </listitem> </itemizedlist> </section> @@ -160,46 +179,67 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about <title>下载和检查媒介</title> <section> <title>下载中</title> - <para>在选择了 ISO 文件后，您可以通过 HTTP 或 BitTorrent -下载它。相应的窗口中将会提示您正在使用的镜像源，并在速度太慢时提醒您更换镜像源。若您使用 HTTP 方式下载，您可能会看到类似下列情形</para> + <para>Once you have chosen your ISO file, you can download it using either http or +BitTorrent. In both cases, you are provided with some information, such as +the mirror in use and an option to switch if the bandwidth is too low. If +http is chosen, you will also see something regarding checksums.</para> <mediaobject> <imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject> - <para>md5sum 和 sha1sum 是用于检查 ISO 文件完整性的工具，只需使用其中一种即可。请您保留它们以便<link -linkend="integrity">后续使用</link>。之后，窗口将会显示：</para> + <para>md5sum and sha1sum are tools to check the ISO integrity. Choose one or the +other, and copy the checksum <link linkend="integrity">for later +use</link>. Then a window similar to this one appears:</para> <mediaobject> <imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject> - <para>点击“保存文件”选项。</para> + <para>Select the Save File option, then, click OK.</para> </section> <section> <title xml:id="integrity">检查下载文件的完整性</title> - <para>这两种校验和均由特定算法计算文件内容产生，且均为十六进制数字。当您使用这些算法来重新计算下载文件的校验值时，如果您得到的结果和 Mageia -提供的一致，说明您的文件没有问题；否则，说明下载失败，您可能需要重新下载，或改用 BitTorrent 下载。</para> - <para>打开一个终端（无需以 root 身份操作），然后：</para> - <para>- 若使用 md5sum，请输入：[sam@localhost]$ <userinput>md5sum -path/to/the/image/file.iso</userinput>。</para> - <para>- 若使用 sha1sum，请输入：[sam@localhost]$ <userinput>sha1sum -path/to/the/image/file.iso</userinput>。</para> - <para>然后比较执行结果（可能需要等待一段时间）和 Mageia 网上提供的数值。例如：</para> + <para>The checksums referred to earlier, are digital fingerprints generated by an +algorithm from the file to be downloaded. You may compare the checksum of +your downloaded ISO against that of the original source ISO. If the +checksums do not match, it means that the actual data on the ISO's do not +match, and if it is the case, then you should retry the download or attempt +a repair using BitTorrent.</para> + <para>To generate the checksum for your downloaded ISO, open a console, (no need +to be root), and:</para> + <itemizedlist> + <listitem> + <para>To use md5sum, type: <userinput>md5sum +path/to/the/image/file.iso</userinput>.</para> + </listitem> + <listitem> + <para>To use sha1sum, type: <userinput>sha1sum +path/to/the/image/file.iso</userinput></para> + </listitem> + </itemizedlist> + <para> Example:</para> <mediaobject> <imageobject> <imagedata fileref="../Md5sum.png"/> </imageobject></mediaobject> - <para/> + <para>and compare the result (you may have to wait for a while) with the checksum +provided by Mageia.</para> </section> </section> <section> <title>刻录或转储 ISO</title> - <para>经过检查后的 ISO 即可被刻录至 CD/DVD，或写入到 U 盘。这些操作不同于简单的复制，其目的是创建一个可引导的媒体。</para> + <para>The verified ISO can now be burned to a CD/DVD or dumped to a USB +stick. This is not a standard copy operation as a bootable medium will +actually be created.</para> <section> <title>将ISO文件刻录到CD或DVD</title> - <para>您可以刻录任何所需镜像，但请确保刻录设备的模式被设为<emphasis -role="bold">刻录镜像</emphasis>，而非刻录数据或文件。更多信息请见 <link -ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">Mageia -wiki</link>。</para> + <para>Whichever software you use, ensure that the option to burn an <emphasis +role="bold">image</emphasis> is used, burn <emphasis +role="bold">data</emphasis> or <emphasis role="bold">files</emphasis> is not +correct. See <link +ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">the Mageia +wiki</link> for more information.</para> </section> <section> <title>写入 ISO 到 U 盘</title> <para>所有的 Mageia ISO 均为混合类型 ISO，因此您可以将其“转储”到 U 盘中，然后使用 U 盘来引导和安装系统。</para> <warning> - <para>“转储”镜像至闪存设备将会破坏设备上原先的文件系统，任何数据都将丢失，并且分区容量将会（暂时）缩减为镜像大小。</para> + <para>"Dumping" an image onto a flash device destroys any previous file-system on +the device; any existing data will be lost and the partition capacity will +be reduced to the image size.</para> </warning> <para>若要恢复原始容量，您必须重新进行分区和格式化操作。</para> <section> @@ -211,23 +251,30 @@ ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks" <section> <title>使用 Windows 下的图形化工具</title> <para>您可以尝试：</para> - <para>- <link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> 中的“ISO -镜像”选项；</para> - <para>- <link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32 -Disk Imager</link></para> + <itemizedlist> + <listitem> + <para><link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the +"ISO image" option;</para> + </listitem> + <listitem> + <para><link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32 Disk +Imager</link></para> + </listitem> + </itemizedlist> </section> <section> <title>使用 GNU/Linux 系统中的命令行程序</title> <warning> - <para>手动进行此操作有潜在 *危险*。如果您弄错了设备 ID，可能会覆盖掉其他分区中的数据。</para> + <para>It is potentially *dangerous* to do this by hand. You risk overwriting +potentially valuable existing data if you specify the wrong target device.</para> </warning> - <para>您也可以在终端中使用 dd 工具：</para> <orderedlist> <listitem> <para>打开一个终端</para> </listitem> <listitem> - <para>使用命令 <userinput>su -</userinput> 获取 root 权限（不要漏掉末尾的“-”）</para> + <para>Become a root (Administrator) user with the command <userinput>su +-</userinput> (don't forget the final '-' )</para> <mediaobject> <imageobject> <imagedata fileref="../Root.png"/> </imageobject></mediaobject> </listitem> @@ -238,9 +285,16 @@ Disk Imager</link></para> <para>输入命令 <userinput>fdisk -l</userinput></para> <mediaobject> <imageobject> <imagedata fileref="../Fdisk.png"/> </imageobject></mediaobject> - <para>或者，您也可以通过命令 <code>dmesg</code> 来查看设备名：在输入末尾，您将看到以 <emphasis>sd</emphasis> -开头的设备名，如 <emphasis>sdd</emphasis></para> - <screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd + </listitem> + <listitem> + <para>Find the device name for your USB stick (by its size), for example +<code>/dev/sdb</code> in the screenshot above, it is an 8GB USB stick.</para> + <para>Alternatively, you can find the device name with the command +<code>dmesg</code>: towards the end of this example, you can see the device +name starting with <emphasis>sd</emphasis>, and in this case, +<emphasis>sdd</emphasis> is the actual device. You can also see that its +size is 2GB:</para> + <para><screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd [72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000 [72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3 [72594.770536] usb 1-1: Product: Mass Storage Device @@ -257,25 +311,30 @@ Disk Imager</link></para> [72595.965025] sd 8:0:0:0: [sdd] No Caching mode page found [72595.965031] sd 8:0:0:0: [sdd] Assuming drive cache: write through [72595.967251] <emphasis>sdd</emphasis>: sdd1 -[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen> - </listitem> - <listitem> - <para>通过磁盘大小来确认您的 U 盘的设备名，例如图中所示的 <code>/dev/sdb</code>，是一个 8GB 的 U 盘。</para> +[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen></para> </listitem> <listitem> - <para>输入命令：# <userinput>dd if=ISO文件的完整路径 of=/dev/sdX bs=1M</userinput></para> - <para>其中，“X”是您的设备名（如：/dev/sdc）</para> - <para>示例：# <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso -of=/dev/sdb bs=1M</userinput></para> + <para>Enter the command: <emphasis role="bold"># <userinput>dd +if=path/to/the/ISO/file of=/dev/sdX bs=1M</userinput></emphasis></para> + <para>Where X=your device name eg: /dev/sdd</para> + <para>Example:<emphasis role="bold"> # <userinput>dd +if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/dev/sdd +bs=1M</userinput></emphasis></para> + <tip> + <para>It might helpful to know that <emphasis role="bold">if</emphasis> stands for +<emphasis role="bold">i</emphasis>nput <emphasis role="bold">f</emphasis>ile +and <emphasis role="bold">of</emphasis> stands for <emphasis +role="bold">o</emphasis>utput <emphasis role="bold">f</emphasis>ile</para> + </tip> </listitem> <listitem> <para>输入命令：# <userinput>sync</userinput></para> </listitem> <listitem> - <para>操作完成，拔下 U 盘</para> + <para>This is the end of the process, and you may now unplug your USB stick.</para> </listitem> </orderedlist> </section> </section> </section> -</section>
\ No newline at end of file +</section> diff --git a/docs/docs/stable/installer/zh_CN/acceptLicense.xml b/docs/docs/stable/installer/zh_CN/acceptLicense.xml index 506698b6..401cf09f 100644 --- a/docs/docs/stable/installer/zh_CN/acceptLicense.xml +++ b/docs/docs/stable/installer/zh_CN/acceptLicense.xml @@ -35,11 +35,11 @@ </info> <mediaobject> -<imageobject condition="classical"> <imagedata xml:id="acceptLicense-im1" -revision="4" align="center" format="PNG" fileref="dx2-license.png"/> -</imageobject> <imageobject> <imagedata xml:id="acceptLicense-im2" -revision="5" align="center" condition="live" format="PNG" -fileref="live-license.png"/> </imageobject></mediaobject> +<imageobject condition="classical"> <imagedata format="PNG" +xml:id="acceptLicense-im1" fileref="dx2-license.png" align="center" +revision="4"/> </imageobject> <imageobject> <imagedata format="PNG" +fileref="live-license.png" xml:id="acceptLicense-im2" revision="5" +align="center" condition="live"/> </imageobject></mediaobject> <section xml:id="license"> <info> @@ -50,7 +50,8 @@ fileref="live-license.png"/> </imageobject></mediaobject> <para>这些许可条款和许可条件适用于整个 <application>Mageia</application> 发行版，你必须予以接受才能继续安装。</para> - <para>要接受, 只要选择 <guilabel>接受</guilabel> 后点击 <guibutton>下一步</guibutton>.</para> + <para>To proceed, simply select <guilabel>Accept</guilabel> and then click on +<guibutton>Next</guibutton>.</para> <para>若你不希望接受这些条件，我们向您表示诚挚歉意。请点击 <guibutton>退出</guibutton> 来重启计算机。</para> @@ -70,6 +71,8 @@ Release Notes</para> - <para>有关此 Mageia 发布版本的重要信息，可以通过点击 <guibutton>发行说明</guibutton> 来阅读。</para> + <para>Important information about this release of +<application>Mageia</application> can be viewed by clicking on the +<guibutton>Release Notes</guibutton> button.</para> </section> </section>
\ No newline at end of file diff --git a/docs/docs/stable/installer/zh_CN/addUser.xml b/docs/docs/stable/installer/zh_CN/addUser.xml index 57488e6e..986e54d3 100644 --- a/docs/docs/stable/installer/zh_CN/addUser.xml +++ b/docs/docs/stable/installer/zh_CN/addUser.xml @@ -1,78 +1,110 @@ -<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="zh_CN" xml:id="addUser"> +<?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> <!-- 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> <title xml:id="root-password-ti2">设置管理员（root 账户）密码：</title> </info> - <para>我们建议任何时候安装 <application>Mageia</application> 都设置一个超级用户或管理员密码（Linux 中一般叫做 -root -密码）。当你在顶部输入框中输入密码时，盾的颜色将会从红色变为黄色、绿色，用以指示你所输入密码的强度。绿色表示你的密码强度较高。你需要在下方输入框中再次输入相同的密码，以确保你之前的密码没有输错。</para> + + <para>It is advisable for all <application>Mageia</application> installations to +set a <emphasis role="bold">superuser</emphasis> (administrator) password, +usually called the <emphasis>root password</emphasis> in Linux. As you type +a password into the top box a shield will change from red to yellow to green +depending on the strength of the password. A green shield shows you are +using a strong password. You need to repeat the same password in the box +underneath, to check that the first entry was not mistyped.</para> + <note xml:id="givePassword"> - <para>所有的密码都区分大小写。建议在密码中混合使用字母（大写和小写）、数字和其他字符。</para> + <para>All passwords are case sensitive. It is best to use a mixture of letters +(upper and lower case), numbers and other characters in a password.</para> </note> </section> + <section xml:id="enterUser"> <info> <title xml:id="enterUser-ti3">输入用户名</title> </info> - <para>在这里添加一个用户。一个用户拥有比超级管理员更少的权限，但是网上冲浪，使用办公软件或者玩游戏等是足够的。</para> + + <para>Add a user here. A regular user has fewer privileges than the <emphasis +role="bold">superuser</emphasis> (root), but enough to use the internet, +office applications or play games and anything else the average user might +use their computer for.</para> + <itemizedlist> <listitem> <para><guibutton>图标</guibutton>：若点击此按钮，则会改变用户图标。</para> </listitem> + <listitem> <para><guilabel>真实姓名</guilabel>：在文本框中输入用户的真名。</para> </listitem> + <listitem> - <para><guilabel>登录名</guilabel>：输入用户的登录名，或让 drakx -根据真实姓名自动设置。<emphasis>登录名区分大小写。</emphasis></para> + <para><guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use +a version of the user's real name. <emphasis role="bold">The login name is +case sensitive.</emphasis></para> </listitem> + <listitem> - <para><guilabel>密码</guilabel>：在此文本框中输入用户密码。后面的盾牌图标将会指示密码强度。（参见 <xref -linkend="givePassword"/>）</para> + <para><guilabel>Password</guilabel>: Type in the user password. There is a shield +at the end of the text box that indicates the strength of the password. (See +also <xref linkend="givePassword"/>)</para> </listitem> + <listitem> - <para><guilabel>密码（重复）</guilabel>：再输入依次用户密码。drakx 将会检查两次输入的密码是否一致。</para> + <para><guilabel>Password (again)</guilabel>: Retype the user password DrakX will +check that you have not mistyped the password.</para> </listitem> </itemizedlist> + <note> - <para>在安装 Mageia 期间添加的任何用户都将拥有读/写保护的主目录（即 umask=0027）。</para> - <para>你可以在<emphasis>配置 - 概要</emphasis>一步中添加其他所需用户，只需选择<emphasis>用户管理</emphasis>即可。</para> + <para>Any users you added while installing Mageia, will have a home directory that +is both read and write protected (umask=0027).</para> + + <para>You can add any extra needed users in the <emphasis>Configuration - +Summary</emphasis> step during the install. Choose <emphasis>User +management</emphasis>.</para> + <para>也可以在安装完成后改变访问权限。</para> </note> </section> + <section xml:id="addUserAdvanced" condition="classical"> <info> <title xml:id="addUserAdvanced-ti3">高级用户管理</title> </info> - <para>若点击<guibutton>高级</guibutton>按钮，您可以在弹出的窗口中对所添加的用户进行设置。</para> - <para condition="classical">此外，您还可以禁用或启用来宾账户。</para> - <warning condition="classical"> - <para>任何使用<emphasis>rbash</emphasis>来宾账户创建的文件将会在注销后被删除。来宾应当将他/她的临时文件存储于 U 盘等设备中。</para> - </warning> + + <para>The <guibutton>Advanced</guibutton> option allows you to edit further +settings for the user you are adding.</para> + <itemizedlist> - <listitem condition="classical"> - <para><guilabel>启用来宾账户</guilabel>：这里您可以启用或禁用来宾账户。来宾账户允许来宾登录并使用电脑，但对其使用更严格的访问权限控制。</para> - </listitem> <listitem> - <para><guilabel>Shell</guilabel>：可以在下列列表中选择用户所使用的 shell（在上一步中添加），可能的选项有 Bash、Dash -和 Sh。</para> + <para><guilabel>Shell</guilabel>: This drop-down list allows you to change the +shell available to any user you added in the previous screen. Options are +<emphasis role="bold">Bash</emphasis>, <emphasis role="bold">Dash</emphasis> +and <emphasis role="bold">Sh</emphasis></para> </listitem> + <listitem> - <para><guilabel>用户 ID</guilabel>：这里您可以设置之前所添加的用户的 ID（数值）。若您不确定如何设置，请将其留空。</para> + <para><guilabel>User ID</guilabel>: Here you can set the <emphasis +role="bold">user ID</emphasis> for any user you added in the previous +screen. If you are unsure what the purpose of this is, then leave it blank.</para> </listitem> + <listitem> - <para><guilabel>组 ID</guilabel>：这里您可以设置之前所添加的用户的 组 ID（数值，一般与用户 ID -相同）。若您不确定如何设置，请将其留空。</para> + <para><guilabel>Group ID</guilabel>: This lets you set the <emphasis +role="bold">group ID</emphasis>. Again, if unsure, leave it blank.</para> </listitem> </itemizedlist> </section> diff --git a/docs/docs/stable/installer/zh_CN/add_supplemental_media.xml b/docs/docs/stable/installer/zh_CN/add_supplemental_media.xml index 6df3d943..253a31f1 100644 --- a/docs/docs/stable/installer/zh_CN/add_supplemental_media.xml +++ b/docs/docs/stable/installer/zh_CN/add_supplemental_media.xml @@ -1,45 +1,51 @@ -<?xml version="1.0" encoding="utf-8"?> -<section version="5.0" xml:lang="zh_CN" xml:id="add_supplemental_media" - 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 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="add_supplemental_media" version="5.0" xml:lang="zh_CN"> <info> <title xml:id="add_supplemental_media-ti1">介质选择 (设置增补的安装介质)</title> - </info> + </info> + + -<mediaobject> + <mediaobject> <!-- papoteur 2013-04-13 - created --> <!-- marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection --> <!-- marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell --> -<imageobject> <imagedata align="center" -fileref="dx2-add_supplemental_media.png" format="PNG" revision="1" -xml:id="dx2-add_supplemental_media-im1"/> </imageobject></mediaobject> +<imageobject> <imagedata format="PNG" +fileref="dx2-add_supplemental_media.png" +xml:id="dx2-add_supplemental_media-im1" align="center" revision="1"/> +</imageobject></mediaobject> - <para>此窗口中列出了已识别的软件仓库。你可以添加其他的软件源，如光盘或远程资源。所选的源将决定下一步中哪些软件包可用于安装。</para> + <para>This screen shows you the list of already recognized repositories. You can +add other sources for packages, like an optical disc or a remote source. +The source selection determines which packages will be available during the +next steps.</para> <para>如果需要获取网络资源，请执行以下两步：</para> <orderedlist> <listitem> - <para>若尚未启用网络链接，请选择并启用它。 </para> + <para>若尚未启用网络链接，请选择并启用它。</para> </listitem> <listitem> - <para>选择一个镜像，或指定 URL（第一个选项）。若选择了镜像，则您需要能够访问所选择的所有仓库（由 Mageia 管理，例如 Nonfree、Tainted -和 Updates）。若指定了 URL，则可以使用特定的仓库或您的个人 NFS。</para> + <para>Selecting a mirror or specifying a URL (very first entry). By selecting a +mirror, you have access to the selection of all repositories managed by +Mageia, like the <emphasis role="bold">Nonfree</emphasis>, the <emphasis +role="bold">Tainted</emphasis> repositories and the <emphasis +role="bold">Updates</emphasis>. With the URL, you can designate a specific +repository or your own NFS installation.</para> </listitem> </orderedlist> - <note> - <para>若您整从包含 32 位软件包的版本升级到 64 位，我们建议您使用此窗口添加在线镜像（勾选一个网络协议）。64 位 DVD iso 仅包含 64 -位软件包和非特定架构的软件包。若添加了在线镜像，则所需 32 位软件包也会被显示在这里。</para> - </note> - + <note> + <para>If you are updating a 64 bit installation which may contain some 32 bit +packages, it is advised to use this screen to add an online mirror by +ticking one of the Network protocols here. The 64-bit DVD ISO only contains +64-bit and noarch packages, it will not be able to update the 32-bit +packages. However, after adding an online mirror, the installer will find +the needed 32-bit packages there.</para> + </note> </section> diff --git a/docs/docs/stable/installer/zh_CN/ask_mntpoint_s.xml b/docs/docs/stable/installer/zh_CN/ask_mntpoint_s.xml index 38e5e6da..d59d6a2d 100644 --- a/docs/docs/stable/installer/zh_CN/ask_mntpoint_s.xml +++ b/docs/docs/stable/installer/zh_CN/ask_mntpoint_s.xml @@ -1,27 +1,27 @@ -<?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="ask_mntpoint_s" 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="ask_mntpoint_s" version="5.0" xml:lang="zh_CN"> <info> <title xml:id="ask_mntpoint_s-ti1">选择挂载点</title> </info> + + + + + + + + -<mediaobject> + <mediaobject> <!-- Made by marja on 2012 03 28 --> <!-- NEEDS TO BE REVIEWED! --> <!-- SimonNZG 2012-04-03 has taken a look but needs to come back --> @@ -33,45 +33,55 @@ write "it's type". And you're right about the redundant part, too, I removed it--> <!-- And JohnR says the Americans are WRONG! :-)) --> <!-- 2012-04-19 Language proofreading done --> -<imageobject condition='classical'> <imagedata revision="1" -fileref="dx2-chooseMountpoints.png" align="center" format="PNG" -xml:id="chooseMountPoints-im1"></imagedata> </imageobject> <imageobject -condition='live'> <imagedata revision="1" -fileref="live-chooseMountpoints.png" align="center" format="PNG" -xml:id="live-chooseMountPoints-im1"></imagedata> </imageobject></mediaobject> +<imageobject condition="classical"> <imagedata format="PNG" +xml:id="chooseMountPoints-im1" align="center" +fileref="dx2-chooseMountpoints.png" revision="1"/> </imageobject> +<imageobject condition="live"> <imagedata format="PNG" +fileref="live-chooseMountpoints.png" align="center" +xml:id="live-chooseMountPoints-im1" revision="1"/> </imageobject></mediaobject> <para>这里你可以查看已找到的 Linux 分区。如果 <application>DrakX</application> 的建议不合适，你可以手动更改挂载点。</para> <note> - <para>如果进行了更改，请确保你仍然具有访问 <literal>/</literal> （根）分区的权限。</para> + <para>If you change anything, make sure you still have a <emphasis +role="bold"><literal>/</literal></emphasis> (root) partition.</para> </note> <itemizedlist> <listitem> - <para>所有分区的属性将按下列顺序显示：“设备名”（“容量”，“挂载点”，“类型”）。</para> + <para>Every partition is shown to the left as: <emphasis role="bold">Device +(capacity, mount point, type).</emphasis></para> </listitem> <listitem> - <para>“设备名”包括：“硬盘驱动器”，[“硬盘驱动器编号”（由字母表示）]，“分区编号”。例如，“sda5”表示第一个 SCSI 设备上的第五个分区。</para> + <para><emphasis role="bold">Device</emphasis>, is made up of: <emphasis +role="bold">hard drive</emphasis>, [<emphasis role="bold">hard drive +name</emphasis> (letter)], <emphasis role="bold">partition number</emphasis> +(for example, <emphasis role="bold">sda5</emphasis>).</para> </listitem> - <listitem> - <para>如果存在多个分区，你可以从下列列表中选择不同的挂载点来使用，例如 -<literal>/</literal>、<literal>/home</literal> 和 -<literal>/var</literal>。也可以自定义挂载点，例如将 <literal>/video</literal> -用于存储视频文件，<literal>/cauldron-home</literal> 用于 cauldron 系统的用户主目录。</para> + <para>If you have several partitions, you can choose various different mount +points from the drop down menu, such as <emphasis role="bold">/</emphasis>, +<emphasis role="bold"><literal>/home</literal></emphasis> and <emphasis +role="bold">/var</emphasis>. You can even make your own mount points, for +instance <emphasis role="bold"><literal>/video</literal></emphasis> for a +partition where you want to store your films, or <emphasis +role="bold">/Data</emphasis> (or some other name) for your data.</para> </listitem> <listitem> - <para>对于非必需的分区，挂载点一项可以留空。</para> + <para>For any partitions that you don't need to make use of, you can leave the +mount point field blank.</para> </listitem> </itemizedlist> <warning> - <para>如果不确定如何选择，请点击 <guibutton>上一步</guibutton> 按钮，然后点击 -<guilabel>自定义磁盘分区</guilabel>，在出现的窗口中点击分区来查看其类型和大小。</para> + <para>If you are not sure what to choose, click <emphasis +role="bold">Previous</emphasis> to go back and then tick <guilabel>Custom +disk partitioning</guilabel>, where, you can click on a partition to see its +type and size.</para> </warning> <para>若确定挂载点设置正确，则可点击 <guibutton>下一步</guibutton>，并确定是否根据 DrakX 的建议格式化分区等。</para> -</section> +</section>
\ No newline at end of file diff --git a/docs/docs/stable/installer/zh_CN/chooseDesktop.xml b/docs/docs/stable/installer/zh_CN/chooseDesktop.xml index 94408611..86e86fdf 100644 --- a/docs/docs/stable/installer/zh_CN/chooseDesktop.xml +++ b/docs/docs/stable/installer/zh_CN/chooseDesktop.xml @@ -6,16 +6,23 @@ - <para>根据所选项不同，随后会出现不同的窗口用于详细设置。</para> + <para>Depending on your selection here, you may be offered further screens to +fine-tune your choice.</para> - <para>在选择完成之后，将会在安装软件包时展示一系列幻灯片。可以按 <guilabel>详细</guilabel> 按钮来关闭幻灯片显示。</para> + <para>After the selection step(s), you will see a slide-show during package +installation. The slide show can be disabled by pressing the +<guilabel>Details</guilabel> button</para> <mediaobject> <imageobject> <imagedata format="PNG" fileref="dx2-chooseDesktop.png" align="center"/> </imageobject></mediaobject> - <para>请选择 <application>KDE</application> 或 <application>GNOME</application> -作为桌面环境。这两种环境均包含有用的应用程序盒工具。若希望全部安装或均不安装，或自定义要安装的默认软件，请点击 -<guilabel>自定义</guilabel>。<application>LXDE</application> -桌面环境较前两者更加轻便，视觉效果较低，默认安装的软件包也更少。</para> + <para>Choose whether you prefer to use the <application>KDE</application> +<emphasis role="bold">Plasma</emphasis> or <application>GNOME</application> +desktop environment. Both come with a full set of useful applications and +tools. Tick <guilabel>Custom</guilabel> if you wish to use neither (or even +use both), or if you want to modify the default software choices for these +desktop environments. The <application>LXDE</application> desktop, for +instance, is lighter than the previous two, sporting less eye candy and +fewer packages installed by default.</para> </section>
\ No newline at end of file diff --git a/docs/docs/stable/installer/zh_CN/choosePackageGroups.xml b/docs/docs/stable/installer/zh_CN/choosePackageGroups.xml index ae613476..24f7e317 100644 --- a/docs/docs/stable/installer/zh_CN/choosePackageGroups.xml +++ b/docs/docs/stable/installer/zh_CN/choosePackageGroups.xml @@ -10,25 +10,30 @@ <imageobject> <imagedata format="PNG" fileref="dx2-choosePackageGroups.png" align="center"/> </imageobject></mediaobject> - <para>软件包按组列出，您可以更方便地选择所需软件。若需要查看某一组的详细说明，请将鼠标移至该组的名称上方。</para> + <para>Packages are arranged into common groups, to make choosing what you need on +your system a lot easier. The groups are fairly self explanatory, however +more information about the content of each is available in tool-tips which +become visible as the mouse is hovered over them.</para> <itemizedlist> <listitem> - <para>工作区</para> + <para><emphasis role="bold">Workstation</emphasis></para> </listitem> <listitem> - <para>服务器。</para> + <para><emphasis role="bold">Server</emphasis></para> </listitem> <listitem> - <para>图形界面环境</para> + <para><emphasis role="bold">Graphical Environment</emphasis></para> </listitem> <listitem> - <para>单独选择软件包：您可以使用此选项来手动添加/移除软件包。</para> + <para><emphasis role="bold">Individual Package Selection</emphasis>: you can use +this option to manually add or remove packages</para> </listitem> </itemizedlist> - <para>请阅读 <xref linkend="minimal-install"/> 来了解如何进行最小化安装（包活或不包括 X 服务和 IceWM 桌面环境）。</para> + <para>See <xref linkend="minimal-install"/> for instructions on how to do a +minimal install (without or with X & IceWM).</para> </section>
\ No newline at end of file diff --git a/docs/docs/stable/installer/zh_CN/choosePackagesTree.xml b/docs/docs/stable/installer/zh_CN/choosePackagesTree.xml index 53b427aa..9abd734b 100644 --- a/docs/docs/stable/installer/zh_CN/choosePackagesTree.xml +++ b/docs/docs/stable/installer/zh_CN/choosePackagesTree.xml @@ -1,19 +1,18 @@ -<?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="choosePackagesTree"> +<?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="choosePackagesTree" version="5.0" xml:lang="zh_CN"> + <info> + <title xml:id="choosePackagesTree-ti1">选择单个软件包</title> + </info> - <info> - <title xml:id="choosePackagesTree-ti1">选择单个软件包</title> - </info> + - - -<mediaobject> + <mediaobject> <!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page--> -<imageobject> <imagedata fileref="dx2-choosePackagesTree.png" align="center" -format="PNG" ></imagedata> </imageobject></mediaobject> +<imageobject> <imagedata format="PNG" fileref="dx2-choosePackagesTree.png" +align="center"/> </imageobject></mediaobject> - <para>您可以在此处添加或移除额外的软件包，或自定义安装。</para> + <para>Here you can add or remove any extra packages to customize your +installation.</para> - <para>在确定选择后，您可以点击页面底部的 <guibutton>floppy icon</guibutton> 按钮来保存选择（同时也会将配置保存到 U + <para>在确定选择后，您可以点击页面底部的 <guibutton>floppy icon</guibutton> 按钮来保存选择（同时也会将配置保存到 U 盘中）。你可以使用此文件在其他系统上进行相同的安装部署（只需在安装时再次点击此按钮并加载配置文件即可）。</para> - </section> - +</section>
\ No newline at end of file diff --git a/docs/docs/stable/installer/zh_CN/configureServices.xml b/docs/docs/stable/installer/zh_CN/configureServices.xml index 9e6d015d..f38adab8 100644 --- a/docs/docs/stable/installer/zh_CN/configureServices.xml +++ b/docs/docs/stable/installer/zh_CN/configureServices.xml @@ -1,37 +1,25 @@ -<?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="configureServices" 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="configureServices"> + <info> + <title xml:id="configureServices-ti1">配置服务</title> + </info> + - <info> - <title xml:id="configureServices-ti1">配置服务</title> - </info> + - - - - -<mediaobject> + <mediaobject> <!-- 2012-12-25 marja - moved this section out of misc-params.xml --> <!-- 2013-05-05 marja - added screenshot --> -<imageobject> <imagedata revision="1" fileref="dx2-configureServices.png" -align="center" format="PNG" xml:id="configureServices-im1"></imagedata> -</imageobject></mediaobject> - - - <para revision="1" xml:id="configureServices-pa1">您可以在此处设置系统启动时需要启用的服务。</para> +<imageobject> <imagedata format="PNG" fileref="dx2-configureServices.png" +xml:id="configureServices-im1" align="center" revision="1"/> </imageobject></mediaobject> - <para revision="1" xml:id="configureServices-pa2">单击各组前的三角形图标可以展开该组中的服务。</para> + <para xml:id="configureServices-pa1" revision="1">Here you can choose which services should start when you boot your system.</para> - <para revision="1" xml:id="configureServices-pa3">DrakX自动选择的设置通常可正常工作。</para> + <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services.</para> - <para revision="1" xml:id="configureServices-pa4">若高亮选中服务，则可在下方的信息框中查看此服务的细节。</para> + <para xml:id="configureServices-pa3" revision="1">The settings DrakX chose are usually good.</para> - <para revision="1" xml:id="configureServices-pa5">只有在您完全了解您的行为的风险后再作出改动。</para> - </section> + <para xml:id="configureServices-pa4" revision="1">若高亮选中服务，则可在下方的信息框中查看此服务的细节。</para> + <para xml:id="configureServices-pa5" revision="1">只有在您完全了解您的行为的风险后再作出改动。</para> +</section>
\ No newline at end of file diff --git a/docs/docs/stable/installer/zh_CN/configureTimezoneUTC.xml b/docs/docs/stable/installer/zh_CN/configureTimezoneUTC.xml index f16c0bad..d9da19a2 100644 --- a/docs/docs/stable/installer/zh_CN/configureTimezoneUTC.xml +++ b/docs/docs/stable/installer/zh_CN/configureTimezoneUTC.xml @@ -1,4 +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" version="5.0" xml:lang="zh_CN" xml:id="configureTimezoneUTC"> +<?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="configureTimezoneUTC" version="5.0" xml:lang="zh_CN"> <info> <title xml:id="configureTimezoneUTC-ti6">配置时区</title> </info> @@ -10,15 +10,17 @@ <mediaobject> <!-- 2012-12-25 marja - moved this part out of misc-params.xml --> <!-- 2013-05-05 marja - added screenshot --> -<imageobject condition="classical"> <imagedata -xml:id="configureTimezoneUTC-im1" revision="1" -fileref="dx2-configureTimezoneUTC.png" align="center" format="PNG"/> -</imageobject> <imageobject> <imagedata fileref="live-timeZone.png" -condition="live" format="PNG"/> </imageobject></mediaobject> +<imageobject condition="classical"> <imagedata format="PNG" +xml:id="configureTimezoneUTC-im1" align="center" +fileref="dx2-configureTimezoneUTC.png" revision="1"/> </imageobject> +<imageobject> <imagedata format="PNG" fileref="live-timeZone.png" +condition="live"/> </imageobject></mediaobject> - <para revision="1" xml:id="configureTimezoneUTC-pa1">选择国家/地区或城市来确定您的时区。</para> + <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your time-zone by choosing your country or a city close to you in the +same time-zone.</para> - <para revision="1" xml:id="configureTimezoneUTC-pa2">在下一个窗口中，您可以将硬件时钟设置为本地时间或 GMT（也即 UTC）。</para> + <para xml:id="configureTimezoneUTC-pa2" revision="1">In the next screen you can choose to set your hardware clock to local time +or to GMT, also known as UTC.</para> <note> <para revision="1" xml:id="configureTimezoneUTC-pa3">若您安装了多个操作系统，请确保硬件时钟均被设为本地时间，或均为 UTC/GMT。</para> diff --git a/docs/docs/stable/installer/zh_CN/configureX_card_list.xml b/docs/docs/stable/installer/zh_CN/configureX_card_list.xml index 6d8f035b..8796da96 100644 --- a/docs/docs/stable/installer/zh_CN/configureX_card_list.xml +++ b/docs/docs/stable/installer/zh_CN/configureX_card_list.xml @@ -1,4 +1,4 @@ -<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_CN" xml:id="configureX_card_list"> +<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_card_list" version="5.0" xml:lang="zh_CN"> @@ -6,7 +6,9 @@ + + <info> <!-- Initiated by Marja 2012-08-08 --> <!-- Further text JohnR 2012-08-29 --> @@ -17,9 +19,9 @@ </info> <mediaobject> -<imageobject> <imagedata revision="1" align="center" -xml:id="configureX_card_list-im1" fileref="dx2-configureX_card_list.png" -format="PNG"/> </imageobject></mediaobject> +<imageobject> <imagedata format="PNG" xml:id="configureX_card_list-im1" +align="center" fileref="dx2-configureX_card_list.png" revision="1"/> +</imageobject></mediaobject> <para>DrakX 有齐全的显卡数据库，一般情况下可以正确识别您的视频设备。</para> @@ -37,13 +39,21 @@ format="PNG"/> </imageobject></mediaobject> </listitem> </itemizedlist></para> - <para>若您找不到所需的制造商列表（如显卡太老，或尚未加入到数据库中），您也可以在 Xorg 目录中找到合适的驱动</para> - - <para>Xorg 目录提供了超过 40 种通用的开源显卡驱动。若您仍然无法找到合适的显卡驱动，请使用 vesa 驱动以确保基本的显示功能。</para> + <para>If you cannot find your card in the vendor lists (because it's not yet in +the database or it's an older card) you may find a suitable driver in the +<emphasis role="bold">Xorg</emphasis> category, which provides more than 40 +generic and open source video card drivers. If you still can't find a +specific driver for your card there is the option of using the <emphasis +role="bold">vesa</emphasis> driver which provides basic capabilities.</para> - <para>请注意，若选择了不兼容的驱动，您可能无法使用图形化界面（但仍可使用命令行）。</para> + <para>Be aware that if you select an incompatible driver you may only have access +to the <emphasis role="bold">Command-line</emphasis> Interface.</para> - <para>部分显卡制造商仅提供私有 Linux 驱动（在 Nonfree 仓库中），部分驱动仅能在制造商的官网上找到。</para> + <para>Some video card manufacturers provide proprietary drivers for Linux which +may only be available in the <emphasis role="bold">Nonfree</emphasis> +repository and in some cases only from the card manufacturers' websites.</para> - <para>需要手动启用 Nonfree 仓库才能使用其中的程序。若您在此之前未选中 Nonfree 仓库，您应当在安装完成并重启后启用它。</para> + <para>The <emphasis role="bold">Nonfree</emphasis> repository needs to be +explicitly enabled to access them. If you didn't enable it previously, you +should do this after your first reboot.</para> </section>
\ No newline at end of file diff --git a/docs/docs/stable/installer/zh_CN/configureX_chooser.xml b/docs/docs/stable/installer/zh_CN/configureX_chooser.xml index 44678ed8..a8b1e153 100644 --- a/docs/docs/stable/installer/zh_CN/configureX_chooser.xml +++ b/docs/docs/stable/installer/zh_CN/configureX_chooser.xml @@ -1,5 +1,4 @@ -<?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="configureX_chooser" 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="configureX_chooser" version="5.0" xml:lang="zh_CN"> <info> <title xml:id="configureX_chooser-ti1">显示卡和显示器配置</title> </info> @@ -8,41 +7,54 @@ <mediaobject> <!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page--> -<imageobject> <imagedata revision="1" fileref="dx2-configureX_chooser.png" -align="center" format="PNG" xml:id="configureX_chooser-im1"> </imagedata> +<imageobject> <imagedata format="PNG" xml:id="configureX_chooser-im1" +fileref="dx2-configureX_chooser.png" align="center" revision="1"/> </imageobject></mediaobject> - <para revision="1" xml:id="configureX_chooser-pa1">无论是哪一种图形环境（也叫桌面环境），都基于一个叫做 <acronym>X 窗口系统</acronym>（也叫 -<acronym>X</acronym>）的服务。因此，必须正确设定以下的 <acronym>X</acronym> 服务属性才能使用 -<acronym>KDE</acronym>、<acronym>Gnome</acronym>、<acronym>LXDE</acronym>等图形环境。若 -<application>DrakX</application> 没有提供默认选项，请手动指定正确参数。</para> + <para revision="1" xml:id="configureX_chooser-pa1">No matter which graphical environment (also known as desktop environment) +you chose for this install of <application>Mageia</application>, they are +all based on a graphical user interface system called <acronym>X Window +System</acronym>, or simply <acronym>X</acronym>. So in order for +<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>, +<acronym>LXDE</acronym> or any other graphical environment to work well, the +following <acronym>X</acronym> settings need to be correct. Choose the +correct settings if none are shown, or if you think the details are +incorrect.</para> <itemizedlist> <listitem> - <para revision="1" xml:id="configureX_chooser-pa2"><emphasis><guibutton>显卡</guibutton></emphasis>：请从列表中选择您的显卡设备。</para> + <para xml:id="configureX_chooser-pa2" revision="1"><emphasis><guibutton>显卡</guibutton></emphasis>：请从列表中选择您的显卡设备。</para> </listitem> <listitem> - <para revision="1" xml:id="configureX_chooser-pa3"><emphasis><guibutton>显示器</guibutton></emphasis>：您可以选择 -<guilabel>即插即用</guilabel> 显示器，或从 <guilabel>制造商</guilabel> 或 -<guilabel>通用</guilabel> 列表中选择显示器。若需要手动指定显示器的横向/纵向刷新率，请点击 -<guilabel>自定义</guilabel>。</para> + <para xml:id="configureX_chooser-pa3" revision="1"><emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose +<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from +the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose +<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and +vertical refresh rates of your monitor.</para> <warning> - <para revision="1" xml:id="configureX_chooser-pa3a">不正确的刷新率可能会损坏显示器</para> + <para xml:id="configureX_chooser-pa3a" revision="1">不正确的刷新率可能会损坏显示器</para> </warning> </listitem> <listitem> - <para revision="1" xml:id="configureX_chooser-pa4"><emphasis><guibutton>分辨率</guibutton></emphasis>：选择显示器的分辨率和色彩深度。</para> + <para xml:id="configureX_chooser-pa4" revision="1"><emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and +color depth of your monitor can be set here.</para> </listitem> <listitem> - <para revision="1" xml:id="configureX_chooser-pa5"><emphasis><guibutton>测试</guibutton></emphasis>：测试按钮不一定总是出现在安装中。您可以按下此按钮来查看设置是否正确。若出现询问设置是否正确的对话框，您可以选择“是”，则当前设置会被保留。若您没有看到任何对话框，您将可以回到配置窗口，并重新进行配置。<emphasis>若无法使用测试功能，请确保您的设置是正确的。</emphasis></para> + <para xml:id="configureX_chooser-pa5" revision="1"><emphasis><guibutton>Test</guibutton></emphasis>: The test button does not +always appear during install. If the option is there, and you test your +settings, you should be ask whether your settings are correct. If you answer +<emphasis role="bold">yes</emphasis>, the settings will be kept. If you +don't see anything, you'll return to the configuration screen and be able to +reconfigure everything until the test result is satisfactory. If the test +option is not available, then make sure your settings are on the safe side.</para> </listitem> <listitem> - <para revision="1" xml:id="configureX_chooser-pa6"><emphasis><guibutton>选项</guibutton></emphasis>：您可以在此处启用或禁用各类选项。</para> + <para xml:id="configureX_chooser-pa6" revision="1"><emphasis><guibutton>选项</guibutton></emphasis>：您可以在此处启用或禁用各类选项。</para> </listitem> </itemizedlist> -</section> +</section>
\ No newline at end of file diff --git a/docs/docs/stable/installer/zh_CN/configureX_monitor.xml b/docs/docs/stable/installer/zh_CN/configureX_monitor.xml index 3c3bde18..873c1704 100644 --- a/docs/docs/stable/installer/zh_CN/configureX_monitor.xml +++ b/docs/docs/stable/installer/zh_CN/configureX_monitor.xml @@ -1,11 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<section version="5.0" xml:lang="zh_CN" xml:id="configureX_monitor" - xmlns="http://docbook.org/ns/docbook" - xmlns:ns5="http://www.w3.org/1999/xhtml" - xmlns:ns4="http://www.w3.org/1998/Math/MathML" - xmlns:ns3="http://www.w3.org/2000/svg" - xmlns:ns2="http://www.w3.org/1999/xlink" - xmlns:ns="http://docbook.org/ns/docbook"> +<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_monitor" version="5.0" xml:lang="zh_CN"> @@ -18,35 +11,37 @@ <!-- Initiated by Marga 2012-8-09 --> <!-- Further text JohnR 2012-08-30 --> <!-- tproof --> -<!-- lproof --> +<!----> <title xml:id="configureX_monitor-ti1">选择您的显示器</title> </info> - <para revision="1" xml:id="configureX_monitor-pa1">DrakX 有齐全的显卡数据库，一般情况下可以正确识别您的视频设备。</para> + <para xml:id="configureX_monitor-pa1" revision="1">DrakX 有齐全的显卡数据库，一般情况下可以正确识别您的视频设备。</para> <warning> - <para revision="1" xml:id="configureX_monitor-pa1w"><emphasis>选择错误的属性可能会损坏显示器或视频设备。若不确定，请不要轻易尝试未知模式。</emphasis>若仍有疑问，请查询显示器文档。</para> + <para xml:id="configureX_monitor-pa1w" revision="1"><emphasis role="bold">Selecting a monitor with different characteristics +could damage your monitor or video hardware. Please don't try something +without knowing what you are doing.</emphasis> If in doubt you should +consult your monitor documentation.</para> </warning> <mediaobject> -<imageobject> <imagedata align="center" fileref="dx2-configureX_monitor.png" -format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></mediaobject> +<imageobject> <imagedata format="PNG" xml:id="configureX_monitor-im1" +fileref="dx2-configureX_monitor.png" align="center" revision="1"/> +</imageobject></mediaobject> - <para revision="1" - xml:id="configureX_monitor-pa2"><emphasis>自定义</emphasis></para> + <para xml:id="configureX_monitor-pa2" revision="1"><emphasis>自定义</emphasis></para> <para revision="1" xml:id="configureX_monitor-pa3">此选项允许您设置两个重要参数：垂直刷新率和水平同步率。垂直刷新率决定屏幕刷新的周期，水平同步率决定扫描行的显示速率。</para> <para revision="1" xml:id="configureX_monitor-pa4"><emphasis>请不要</emphasis>选择与您的显示器不匹配的同步范围，这样做可能损害显示器。若仍有疑问，请查询显示器文档。</para> - <para revision="1" xml:id="configureX_monitor-pa5"><emphasis>即插即用</emphasis></para> + <para xml:id="configureX_monitor-pa5" revision="1"><emphasis>即插即用</emphasis></para> - <para revision="1" xml:id="configureX_monitor-pa6">默认选项，根据显示器数据库确定显示器类别。</para> + <para xml:id="configureX_monitor-pa6" revision="1">默认选项，根据显示器数据库确定显示器类别。</para> - <para revision="1" - xml:id="configureX_monitor-pa7"><emphasis>供应商</emphasis></para> + <para xml:id="configureX_monitor-pa7" revision="1"><emphasis>供应商</emphasis></para> - <para revision="1" xml:id="configureX_monitor-pa8">若安装程序无法正确检测您的显示器，请在以下列表中选择一个合适的配置： <itemizedlist> + <para xml:id="configureX_monitor-pa8" revision="1">若安装程序无法正确检测您的显示器，请在以下列表中选择一个合适的配置： <itemizedlist> <listitem> <para>制造商</para> </listitem> @@ -60,9 +55,12 @@ format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></medi </listitem> </itemizedlist></para> - <para revision="1" - xml:id="configureX_monitor-pa9"><emphasis>通用</emphasis></para> + <para xml:id="configureX_monitor-pa9" revision="1"><emphasis>通用</emphasis></para> - <para revision="1" xml:id="configureX_monitor-pa10">此组可以支持近30种显示格式，如 1024x768 @ 60Hz 和笔记本上使用的平板显示器。当您因硬件无法被正确识别而必须使用 Vesa -显卡驱动器时，此选项将会提供最佳的兼容性。推荐保留此选项。</para> -</section> + <para xml:id="configureX_monitor-pa10" revision="1">selecting this group will list nearly 30 display configurations such as +1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is +often a good monitor selection group if you need to use the <emphasis +role="bold">Vesa</emphasis> card driver when your video hardware cannot be +determined automatically. Once again it may be wise to be conservative in +your selections.</para> +</section>
\ No newline at end of file diff --git a/docs/docs/stable/installer/zh_CN/diskdrake.xml b/docs/docs/stable/installer/zh_CN/diskdrake.xml index 3e68c1d8..5f11190b 100644 --- a/docs/docs/stable/installer/zh_CN/diskdrake.xml +++ b/docs/docs/stable/installer/zh_CN/diskdrake.xml @@ -1,37 +1,61 @@ -<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1998/Math/MathML" version="5.0" xml:lang="zh_CN" xml:id="diskdrake"> +<?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> <!-- 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 fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject> + <warning> - <para revision="3" xml:id="diskdrake-pa1">若您希望将 <literal>/</literal> 分区加密，您必须确保 /boot 位于单独的分区中，并且该分区不能被加密；否则，系统将无法启动。</para> + <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <emphasis role="bold">/</emphasis> +partition you must ensure that you have a separate <emphasis +role="bold">/boot</emphasis> partition. The encryption option for the +<emphasis role="bold">/boot</emphasis> partition must NOT be set, otherwise +your system will be unbootable.</para> </warning> - <para xml:id="diskdrake-pa3" revision="2">在此处调整磁盘布局。您可以移除或创建分区、改变文件系统类型或改变分区大小，同时预览操作后的效果。</para> - <para xml:id="diskdrake-pa4" revision="1">每个硬盘及其他存储设备（如 U 盘）都在对应的标签页中显示。例如，在三个标签页中分别显示 sda、sdb、sdc 的磁盘布局。 </para> - <para xml:id="diskdrake-pa5" revision="1">点击 <guibutton>全部清除</guibutton> 可以删除所选设备上的全部分区。</para> + + <para xml:id="diskdrake-pa3" revision="2">Modify the layout of your disk(s) here. You can remove or create +partitions, change the filesystem of a partition or change its size and even +view their details before you start.</para> + + <para xml:id="diskdrake-pa4" revision="1">There is a tab at the top for every detected hard disk (or other storage +device like a USB key). In the screen-shot above there are two available +devices: <emphasis role="bold">sda </emphasis>and <emphasis +role="bold">sdb</emphasis>.</para> + + <para xml:id="diskdrake-pa5" revision="1">Take care with the <guibutton>Clear all</guibutton> option, use it only if +you are sure you want to wipe all partitions on the selected storage device.</para> + <para xml:id="diskdrake-pa6" revision="1">For all other actions: click on the desired partition first. Then view it, or choose a filesystem and a mount point, resize it or wipe -it. <guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert -mode</guibutton>) gives some more tools like to add a label or to choose a -partition type. </para> - <para xml:id="diskdrake-pa6a" revision="1">请继续，直到所需操作完成。</para> +it. <guibutton>Expert mode</guibutton> provides more options such as a label +(give a name to) a partition, or to choose a partition type.</para> + + <para xml:id="diskdrake-pa6a" revision="1">Continue until you have adjusted everything to your satisfaction.</para> + <para xml:id="diskdrake-pa7" revision="1"> 准备好时点击<guibutton>完成</guibutton>按钮。</para> + <note> - <para>若您需要在 UEFI 硬件上使用 Mageia，请确保您设置了 ESP（EFI 系统分区），并且已被挂载至 /boot/EFI（见下）</para> - <para><mediaobject><imageobject condition="classical"><imagedata fileref="dx2-diskdrake2.png" -align="center"/></imageobject><imageobject condition="live"><imagedata -align="center" fileref="live-diskdrake2.png"/></imageobject></mediaobject></para> + <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System +Partition) is present and correctly mounted on /boot/EFI (see below)</para> + + <para><mediaobject> +<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake2.png" +align="center"/> </imageobject> <imageobject condition="live"> <imagedata +align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></para> </note> + <note> <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot partition is present and of the correct type</para> + <mediaobject> <imageobject condition="classical"> <imagedata align="center" fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject diff --git a/docs/docs/stable/installer/zh_CN/doPartitionDisks.xml b/docs/docs/stable/installer/zh_CN/doPartitionDisks.xml index e2dda7a9..6d36aa94 100644 --- a/docs/docs/stable/installer/zh_CN/doPartitionDisks.xml +++ b/docs/docs/stable/installer/zh_CN/doPartitionDisks.xml @@ -1,6 +1,8 @@ -<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="zh_CN" xml:id="doPartitionDisks"> +<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_CN" xml:id="doPartitionDisks"> + + <info> <!----> <!-- lebarhon 20161216 updated for Mageia 6 @@ -8,50 +10,151 @@ lebarhon 20170209 added SC--> <title xml:id="doPartitionDisks-ti1">分区</title> </info> - <para xml:id="doPartitionDisks-pa1" revision="1">在此处您可以查看硬盘驱动器中的内容，并选择 DrakX 分区向导所提供的 <application>Mageia</application> -的安装方法。</para> - <para xml:id="doPartitionDisks-pa2" revision="1">根据特定硬盘布局和内容的不同，下列选项可能会有所不同。</para> + + <para xml:id="doPartitionDisks-pa1" revision="1">In this screen you can see the content of your hard drive(s) along with the +DrakX partitioning proposals for where to install +<application>Mageia</application>.</para> + + <para xml:id="doPartitionDisks-pa2" revision="1">The options available from those shown below will vary according to the +layout and content of your particular hard drive(s).</para> + <mediaobject> <imageobject condition="classical"> <imagedata fileref="dx2-doPartitionDisks.png" align="center"/> </imageobject> <imageobject condition="live"> <imagedata fileref="live-doPartitionDisks.png" align="center"/> </imageobject></mediaobject> - <para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist><listitem><para revision="1" xml:id="doPartitionDisks-pa4">使用现存的分区</para><para xml:id="doPartitionDisks-pa5" revision="1">若此选项可用，表面安装程序找到了现存的 Linux 分区，并且可以将其用于 Mageia 的安装。</para></listitem><listitem><para xml:id="doPartitionDisks-pa6" revision="1">使用空闲空间</para><para xml:id="doPartitionDisks-pa7" revision="1">若硬盘上有未使用的区域，此选项将会把 Mageia 安装到该区域中。</para></listitem><listitem><para xml:id="doPartitionDisks-pa8" revision="1">使用 Windows 分区中的空闲空间</para><para xml:id="doPartitionDisks-pa9" revision="1">若现存 Windows 分区中有空闲空间，安装程序将把 Mageia 安装在此处。</para><para xml:id="doPartitionDisks-pa10" revision="2">此选项可用于为 Mageia 腾出安装空间，但操作过程有一定风险。请您确保已经备份了所有重要文件！</para><para revision="3" xml:id="doPartitionDisks-pa11">将会缩小 Windows 分区的大小。该分区必须为“clean”状态，即上一次使用 Windows -时必须正常地关机或重启。同时，该分区也应当进行碎片整理，即便不能将文件碎片完全移出待使用区域。我们推荐您对个人文件进行备份后再进行此操作。</para><para>安装程序将用亮蓝色标记其余的 Windows 分区，用深蓝色标记将用于安装 Mageia -的分区位置。您可以点击和拖动目标分区之间的空隙以便更改分区大小（参见下面的截图）。</para><mediaobject><imageobject condition="classical"><imagedata -fileref="dx2-doPartitionDisks2.png" -align="center"/></imageobject><imageobject condition="live"><imagedata -fileref="live-doPartitionDisks2.png" align="center"/></imageobject></mediaobject></listitem></itemizedlist> <itemizedlist><listitem><para xml:id="doPartitionDisks-pa12" revision="1">擦除磁盘，并使用整个磁盘。</para><para xml:id="doPartitionDisks-pa13" revision="1">此选项将会把整个硬盘空间用于安装 Mageia。</para><para xml:id="doPartitionDisks-pa14" revision="1">注意！将会删除所选驱动器上的所有数据！请谨慎操作！</para><para xml:id="doPartitionDisks-pa15" revision="1">若您需要将磁盘的一部分用于存储其他数据，或者您不希望驱动器上的数据丢失，请不要使用此选项。</para></listitem></itemizedlist><itemizedlist><listitem><para xml:id="doPartitionDisks-pa16" revision="1">Custom disk partitioning</para><para xml:id="doPartitionDisks-pa17" revision="1">允许您完全控制系统在硬盘上的安装方式。</para></listitem></itemizedlist></para> + + <para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist> + <listitem> + <para revision="1" xml:id="doPartitionDisks-pa4">使用现存的分区</para> + + <para xml:id="doPartitionDisks-pa5" revision="1">若此选项可用，表面安装程序找到了现存的 Linux 分区，并且可以将其用于 Mageia 的安装。</para> + </listitem> + + <listitem> + <para xml:id="doPartitionDisks-pa6" revision="1">使用空闲空间</para> + + <para xml:id="doPartitionDisks-pa7" revision="1">若硬盘上有未使用的区域，此选项将会把 Mageia 安装到该区域中。</para> + </listitem> + + <listitem> + <para xml:id="doPartitionDisks-pa8" revision="1">使用 Windows 分区中的空闲空间</para> + + <para xml:id="doPartitionDisks-pa9" revision="1">若现存 Windows 分区中有空闲空间，安装程序将把 Mageia 安装在此处。</para> + + <para xml:id="doPartitionDisks-pa10" revision="2">此选项可用于为 Mageia 腾出安装空间，但操作过程有一定风险。请您确保已经备份了所有重要文件！</para> + + <para revision="3" xml:id="doPartitionDisks-pa11">将会缩小 Windows 分区的大小。该分区必须为“clean”状态，即上一次使用 Windows +时必须正常地关机或重启。同时，该分区也应当进行碎片整理，即便不能将文件碎片完全移出待使用区域。我们推荐您对个人文件进行备份后再进行此操作。</para> + + <para>With this option, the installer displays the remaining Windows partition in +light blue and the proposed Mageia partition in dark blue with their +intended sizes just underneath. You have the option to modify these sizes by +clicking and dragging the gap between both partitions. See the following +screen-shot.</para> + + <mediaobject> +<imageobject condition="classical"> <imagedata +fileref="dx2-doPartitionDisks2.png" align="center"/> </imageobject> +<imageobject condition="live"> <imagedata +fileref="live-doPartitionDisks2.png" align="center"/> </imageobject></mediaobject> + </listitem> + </itemizedlist> <itemizedlist> + <listitem> + <para xml:id="doPartitionDisks-pa12" revision="1">擦除磁盘，并使用整个磁盘。</para> + + <para xml:id="doPartitionDisks-pa13" revision="1">This option will allocate the entire drive for Mageia.</para> + + <para xml:id="doPartitionDisks-pa14" revision="1">注意！将会删除所选驱动器上的所有数据！请谨慎操作！</para> + + <para xml:id="doPartitionDisks-pa15" revision="1">若您需要将磁盘的一部分用于存储其他数据，或者您不希望驱动器上的数据丢失，请不要使用此选项。</para> + </listitem> + </itemizedlist><itemizedlist> + <listitem> + <para xml:id="doPartitionDisks-pa16" revision="1">Custom disk partitioning</para> + + <para xml:id="doPartitionDisks-pa17" revision="1">允许您完全控制系统在硬盘上的安装方式。</para> + </listitem> + </itemizedlist></para> + <para><emphasis role="bold">Partition sizing:</emphasis></para> - <para>安装程序将会根据下列规则使用可用空间：</para> - <para><itemizedlist><listitem><para>若可用空间小于 50GB，则只创建 / 分区，不创建单独的 /home 分区。</para></listitem><listitem><para>若总可用空间大于 50GB，则创建三个分区。</para><itemizedlist><listitem><para>其中 6/19 被分配给 / 分区，最大不超过 50GB</para></listitem><listitem><para>1/19 被分配给交换分区，最大不超过 4GB</para></listitem><listitem><para>剩余部分（至少 12/19）被分配给 /home 分区</para></listitem></itemizedlist></listitem></itemizedlist></para> - <para>这意味着如果您有 160GB 可用空间，将会创建 50GB 的 / 分区，4GB 的交换分区，以及 106GB 的 /home 分区。</para> + + <para>If you are not using the <emphasis role="bold">Custom disk +partitioning</emphasis> option, the installer will allocate the available +space according to the following rules:</para> + + <para><itemizedlist> + <listitem> + <para>If the total available space is less than 50 GB, then only one partition is +created. This will be the <emphasis role="bold">/</emphasis> (root) +partition.</para> + </listitem> + + <listitem> + <para>If the total available space is greater than 50 GB, then three partitions +are created</para> + + <itemizedlist> + <listitem> + <para>6/19 of the total available place is allocated to <emphasis +role="bold">/</emphasis> with a maximum of 50 GB</para> + </listitem> + + <listitem> + <para>1/19 被分配给交换分区，最大不超过 4GB</para> + </listitem> + + <listitem> + <para>the rest (at least 12/19) is allocated to <emphasis +role="bold">/home.</emphasis></para> + </listitem> + </itemizedlist> + </listitem> + </itemizedlist></para> + + <para>That means that from 160 GB or greater available space, the installer will +create three partitions: 50 GB for <emphasis role="bold">/</emphasis>, 4 GB +for <emphasis role="bold">swap</emphasis> and the remainder for <emphasis +role="bold">/home</emphasis>.</para> + <note> - <para>If you are using an UEFI system, the ESP (EFI System Partition) will be -automatically detected, or created if it does not exist yet, and mounted on -/boot/EFI. The "Custom disk partitioning" option is the only one that allows -to check it has been correctly done</para> + <para>If you are using a UEFI system, the ESP (EFI System Partition) will be +automatically detected - or created if it does not exist yet, and mounted on +/boot/EFI. The <emphasis role="bold">Custom disk partitioning</emphasis> +option is the only one that allows to check it has been correctly done</para> </note> + <note> - <para>If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, -you need to create a Bios boot partition if not already existing. It is an -about 1 MiB partition with no mount point. Choose <xref -linkend="diskdrake"/> to be able to create it with the Installer like any -other partition, just select BIOS boot partition as filesystem type.</para> + <para>If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to +create a BIOS boot partition if not already existing. It is a roughly 1 MiB +partition with no mount point. Choose <xref linkend="diskdrake"/> to be able +to create it with the Installer like any other partition, just select BIOS +boot partition as the filesystem type.</para> + <mediaobject> <imageobject condition="classical"> <imagedata align="center" fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject condition="live"> <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> - <para>“对齐到”“MiB”</para> - <para>“前面的自由空间（MiB）”“2”</para> - <para>确保所有创建的分区的大小均为偶数倍 MB。</para> + <para>Some newer drives are now using 4096 byte logical sectors, instead of the +previous standard of 512. Due to lack of available hardware, the +partitioning tool used in the installer has not been tested with such a +drive. Also some SSD devices now use an erase block size over 1 MB. If you +have such a device we suggest that you partition the drive in advance, using +an alternative partitioning tool like <emphasis +role="bold">gparted</emphasis>, and to use the following settings:</para> + + <para><emphasis role="bold">Align to</emphasis> = MiB</para> + + <para><emphasis role="bold">Free space preceding (MiB)</emphasis> = 2</para> + + <para>Also make sure all partitions are created using an even number of megabytes.</para> </warning> </section>
\ No newline at end of file diff --git a/docs/docs/stable/installer/zh_CN/exitInstall.xml b/docs/docs/stable/installer/zh_CN/exitInstall.xml index a1fe0e36..bd404105 100644 --- a/docs/docs/stable/installer/zh_CN/exitInstall.xml +++ b/docs/docs/stable/installer/zh_CN/exitInstall.xml @@ -1,15 +1,23 @@ -<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" 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> <!-- Lebarhon 20170209 updated SC--> <imageobject> <imagedata format="PNG" fileref="dx2-exitInstall.png" align="center" revision="1" xml:id="exitInstall-im1"/> </imageobject></mediaobject> + <para xml:id="exitInstall-pa1" revision="2">您以完成安装和配置 Mageia，现在可以安全地移除安装介质并重新启动。</para> - <para xml:id="exitInstall-pa2" revision="2">重启之后，在引导界面可以看到操作系统选项（若您的计算机上有两个以上操作系统）。</para> + + <para xml:id="exitInstall-pa2" revision="2">After reboot, in the bootloader screen, you can choose between the operating +systems (if there are more than one) on your computer.</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/docs/stable/installer/zh_CN/firewall.xml b/docs/docs/stable/installer/zh_CN/firewall.xml index e134502f..f792c613 100644 --- a/docs/docs/stable/installer/zh_CN/firewall.xml +++ b/docs/docs/stable/installer/zh_CN/firewall.xml @@ -3,31 +3,29 @@ <title xml:id="firewall-ti1">Firewall</title> </info> - <para xml:id="firewall-pa1" revision="1">This section allows to configure some simple firewall rules: they determine -which type of message from the Internet will be accepted by the target -system. This, in turn, allows the corresponding services on the system to be -accessible from the Internet.</para> - - <para>In the default setting, no button is checked - no service of the system is -accessibly from the network. The "<emphasis>Everything (no -firewall)</emphasis>" button has a particular role: it enables access to all -services of the machine - an option that does not make much sense in the -context of the installer since it would create a totally unprotected -system. Its veritable use is in the context of the Mageia Control Center -(which uses the same GUI layout) for temporarily disabling the entire set of -firewall rules for testing and debugging purposes.</para> - - <para>All other checkbuttons are more or less self-explanatory. As an example, you -will check the "CUPS server" button if you want printers on your machine to -be accessible from the network.</para> + <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they +determine which type of message from the Internet will be accepted by the +target system. This, in turn, allows the corresponding services on the +system to be accessible from the Internet.</para> + + <para>In the default setting (no button is checked), no service of the system is +accessible from the network. The <emphasis role="bold">Everything (no +firewall)</emphasis> enables access to all services of the machine - an +option that does not make much sense in the context of the installer since +it would create a totally unprotected system. Its veritable use is in the +context of the Mageia Control Center (which uses the same GUI layout) for +temporarily disabling the entire set of firewall rules for testing and +debugging purposes.</para> + + <para>All other options are more or less self-explanatory. As an example, you will +enable the <emphasis role="bold">CUPS server</emphasis> if you want printers +on your machine to be accessible from the network.</para> <para><emphasis role="bold">Advanced</emphasis></para> - <para>The set of checkbuttons only comprises the most common services. The -"Advanced" button allows to enable messages that correspond to a service for -which no checkbutton exists. The "<emphasis>Advanced</emphasis>" button -opens a window where you can enable a series of services by typing a list of -couples (blank separated)</para> + <para>The <emphasis role="bold">Advanced</emphasis> option opens a window where +you can enable a series of services by typing a list of couples (blank +separated)</para> <para><emphasis><port-number>/<protocol></emphasis></para> diff --git a/docs/docs/stable/installer/zh_CN/formatPartitions.xml b/docs/docs/stable/installer/zh_CN/formatPartitions.xml index 7b56dbc0..a59ddf3b 100644 --- a/docs/docs/stable/installer/zh_CN/formatPartitions.xml +++ b/docs/docs/stable/installer/zh_CN/formatPartitions.xml @@ -1,5 +1,4 @@ -<?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="formatPartitions"> - +<?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="formatPartitions" version="5.0" xml:lang="zh_CN"> <info> <title xml:id="formatPartitions-ti1">格式化</title> </info> @@ -7,34 +6,35 @@ + + - - - - - - <mediaobject> + + <mediaobject> <!-- Made by marja on 2012 03 29 --> <!-- NEEDS TO BE REVIEWED! --> <!-- marja 2012-04-24 added screenshot --> <!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 --> -<imageobject condition='classical'> <imagedata revision="1" -fileref="dx2-formatPartitions.png" format="PNG" align="center" -xml:id="formatPartitions-im1"> </imagedata> </imageobject> <imageobject -condition='live'> <imagedata revision="1" -fileref="live-formatPartitions.png" format="PNG" align="center" -xml:id="live-formatPartitions-im1"> </imagedata> </imageobject></mediaobject> +<imageobject condition="classical"> <imagedata format="PNG" +fileref="dx2-formatPartitions.png" xml:id="formatPartitions-im1" +align="center" revision="1"/> </imageobject> <imageobject condition="live"> +<imagedata format="PNG" xml:id="live-formatPartitions-im1" align="center" +fileref="live-formatPartitions.png" revision="1"/> </imageobject></mediaobject> - <para revision="2" xml:id="formatPartitions-pa1">这里您可以选择要格式化的分区。<emphasis>未标记为格式化</emphasis>的分区上的数据将会被保留。</para> + <para xml:id="formatPartitions-pa1" revision="2">Here you can choose which partition(s) you wish to format. Any data on +partitions <emphasis>not</emphasis> marked for formatting will be preserved.</para> - <para revision="1" xml:id="formatPartitions-pa2">一般情况下，DrakX 自动选择的分区需要被格式化。</para> + <para xml:id="formatPartitions-pa2" revision="1">一般情况下，DrakX 自动选择的分区需要被格式化。</para> - <para revision="1" xml:id="formatPartitions-pa3">可以点击 <guibutton>高级</guibutton> 来选择您要检查<emphasis>坏块</emphasis>的分区。</para> + <para xml:id="formatPartitions-pa3" revision="1">可以点击 <guibutton>高级</guibutton> 来选择您要检查<emphasis>坏块</emphasis>的分区。</para> <tip> - <para revision="1" xml:id="formatPartitions-pa4">若您不确定所做选择是否正确，可以点击两次 <guibutton>上一页</guibutton>回到主界面，然后查看相应分区中的数据。</para> + <para xml:id="formatPartitions-pa4" revision="1">If you're not sure you have made the right choice, you can click on +<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton> +and then on <guibutton>Custom</guibutton> to get back to the main screen, +where you can choose to view details of your partitions.</para> </tip> - <para revision="1" xml:id="formatPartitions-pa5">若您确定选项正确，请点击<guibutton>下一页</guibutton>继续。</para> -</section> + <para xml:id="formatPartitions-pa5" revision="1">若您确定选项正确，请点击<guibutton>下一页</guibutton>继续。</para> +</section>
\ No newline at end of file diff --git a/docs/docs/stable/installer/zh_CN/installUpdates.xml b/docs/docs/stable/installer/zh_CN/installUpdates.xml index 94db8220..c7bfb87a 100644 --- a/docs/docs/stable/installer/zh_CN/installUpdates.xml +++ b/docs/docs/stable/installer/zh_CN/installUpdates.xml @@ -1,29 +1,29 @@ -<?xml version='1.0' encoding='utf-8'?> +<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="zh_CN"> + <info> + <title xml:id="installUpdates-ti1">更新</title> + </info> -<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_CN" xml:id="installUpdates"><info><title xml:id="installUpdates-ti1">更新</title></info> + + + + - - - - - <mediaobject> + <mediaobject> <!-- Made by marja on 2012 03 30 --> <!-- NEEDS TO BE REVIEWED! --> <!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename--> <!-- marja, 2012-04-24 added screenshot --> -<imageobject> <imagedata revision="1" fileref="dx2-installUpdates.png" -format="PNG" align="center" xml:id="installUpdates-im1"></imagedata> -</imageobject></mediaobject> - - <para revision="1" xml:id="installUpdates-pa1">在此版本的 <application>Mageia</application> 发布之后，一些软件包将会被更新或改善。</para> +<imageobject> <imagedata format="PNG" fileref="dx2-installUpdates.png" +align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject> - <para revision="1" xml:id="installUpdates-pa2">若您希望下载和安装更新后的软件包，请选择 <guilabel>是</guilabel>；若您不希望这样做，或无法连接到互联网，请选择 -<guilabel>否</guilabel>。</para> + <para xml:id="installUpdates-pa1" revision="1">在此版本的 <application>Mageia</application> 发布之后，一些软件包将会被更新或改善。</para> - <para revision="1" xml:id="installUpdates-pa3">然后按<guibutton>下一步</guibutton>继续</para> + <para xml:id="installUpdates-pa2" revision="1">Choose <guilabel>Yes</guilabel> if you wish to download and install them, +select <guilabel>No</guilabel> if you don't want to do this now, or if you +aren't connected to the Internet</para> -</section> -
\ No newline at end of file + <para xml:id="installUpdates-pa3" revision="1">Press <guibutton>Next</guibutton> to continue</para> +</section>
\ No newline at end of file diff --git a/docs/docs/stable/installer/zh_CN/installer.xml b/docs/docs/stable/installer/zh_CN/installer.xml index 54b09df2..7dd32d1f 100644 --- a/docs/docs/stable/installer/zh_CN/installer.xml +++ b/docs/docs/stable/installer/zh_CN/installer.xml @@ -1,6 +1,13 @@ -<?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="installer"> +<?xml version="1.0" encoding="utf-8"?> +<section version="5.0" xml:lang="zh_CN" xml:id="installer" + 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"> <info> - <title xml:id="Select-and-use-ISOs-ti1">DrakX，Mageia 的安装器</title> + <title xml:id="installer-ti1">DrakX，Mageia 的安装器</title> </info> <para>无论您是刚接触 GNU-Linux 的新人，还是老手，Mageia 安装器都能帮您轻松安装或升级系统。</para> @@ -14,61 +21,87 @@ <title>Using a Mageia DVD</title> <para>Here are the default welcome screens when using a Mageia DVD, The first one -with an UEFI system and the second one with a Legacy system:</para> +is what you will see if you have a UEFI system, the second one is for a +Legacy system:</para> <mediaobject> <imageobject> <imagedata fileref="dx-welcome2.png"/> </imageobject></mediaobject> - <para>From this screen, you can access to options by pressing the "e" letter to -enter the "edit mode". To come back to this screen, press either the key -"esc" to quit without saving or press the key "Ctrl" or "F10" to quit with -saving.</para> + <para>From this screen, you have access to options by pressing "<emphasis +role="bold">e</emphasis>" to enter the edit mode. To come back to this +screen, press either <emphasis role="bold">Esc</emphasis> key to quit +without saving or press the key <emphasis role="bold">Ctrl</emphasis> or +<emphasis role="bold">F10</emphasis> to quit with saving.</para> <mediaobject> <imageobject> <imagedata fileref="dx-welcome.png"/> </imageobject></mediaobject> - <para>From this screen, it is possible to set some personal preferences:<itemizedlist> + <para>From this screen, it is possible to set some preferences (note that the +options <emphasis role="bold">F1</emphasis> to <emphasis +role="bold">F6</emphasis> are available only on Legacy systems):<itemizedlist> <listitem> - <para>按 F2 选择语言（仅用于安装，可能与系统所选语言有出入）（仅用于传统模式）。</para> + <para>Within any of the <emphasis role="bold">F2</emphasis> to <emphasis +role="bold">F6</emphasis> options, you can view relevant help by pressing +<emphasis role="bold">F1</emphasis></para> + </listitem> + </itemizedlist></para> + + <para><itemizedlist> + <listitem> + <para>Press <emphasis role="bold">F2</emphasis> to have the installer use a +specific language for the installation.</para> <mediaobject> <imageobject> <imagedata fileref="dx-welcome-lang.png"/> </imageobject></mediaobject> - <para>使用方向键来选择语言，然后按 Enter 键。</para> - - <para>此处给出了使用 Live DVD/CD 安装时法语版的欢迎界面。注意，Live DVD/CD -菜单中不包括：<guilabel>救援系统</guilabel>, <guilabel>内存测试</guilabel> and -<guilabel>硬件检测工具</guilabel>。</para> - - <mediaobject> -<imageobject> <imagedata fileref="dx-welcome4fr.png"/> </imageobject></mediaobject> + <para>Use the arrow keys to select the language then press <emphasis +role="bold">Enter</emphasis>.</para> </listitem> <listitem> - <para>按 F3 键可以更改屏幕分辨率（仅用于传统模式）。</para> + <para>If needed, change the screen resolution by pressing <emphasis +role="bold">F3</emphasis> (Legacy mode only).</para> <mediaobject> <imageobject> <imagedata fileref="dx-welcome5def.png"/> </imageobject></mediaobject> </listitem> <listitem> - <para>按 <emphasis role="bold">F6</emphasis> 键（传统模式下）或 <emphasis -role="bold">e</emphasis> 键（UEFI 模式下）可以添加内核参数。</para> - - <para>若安装失败，您可能需要尝试其他的选项。按 F6 键可以调出 <guilabel>引导选项</guilabel>，这里提供了四个选项：</para> - - <para>- 默认，即使用默认选项。</para> - - <para>- 默认，即使用默认选项。</para> - - <para>- 无 ACPI（高级配置与电源接口），不使用电源管理功能</para> - - <para>- 无本地 APIC（本地高级可编程终端控制器）。若您不需要控制 CPU 中断，可以选择此选项</para> + <para>If you experience problems with the installation, you could try modifying +the default settings using the <emphasis role="bold">F6</emphasis> <emphasis +role="bold">Kernel Options</emphasis> (for UEFI systems press <emphasis +role="bold">e</emphasis> instead).</para> + + <itemizedlist> + <listitem> + <para>Default: It doesn't alter anything in the default options.</para> + </listitem> + + <listitem> + <para>Safe Settings: Priority is given to the safer options at the price of a +performance detriment.</para> + </listitem> + + <listitem> + <para>No ACPI: (Advanced Configuration and Power Interface): Power management +features are not used.</para> + </listitem> + </itemizedlist> + + <itemizedlist> + <listitem> + <para>No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU +interrupt. Select this option if you experience system misbehaviour like a +kernel panic in relation to APIC.</para> + </listitem> + </itemizedlist> <para>若选择了这些选项之一，将会同时更改<guilabel>引导选项</guilabel>行中的默认选项。</para> <note> - <para>在部分 Mageia 版本中，使用 F6 键选择的选项可能不会在<guilabel>引导选项</guilabel>中出现，但这并不影响选项发挥作用。</para> + <para>In some Mageia releases, it may happen that the entries selected with +<emphasis role="bold">F6</emphasis> do not appear in the <guilabel>Boot +Options</guilabel> line, despite this, they will in fact be applied.</para> </note> <mediaobject> @@ -76,23 +109,25 @@ role="bold">e</emphasis> 键（UEFI 模式下）可以添加内核参数。</par </listitem> <listitem> - <para>按 F1 键可以添加更多内核参数（仅用于传统模式）。</para> - - <para>Pressing F1 opens a new window with more available options. Select one with -the arrow keys and press Enter to have more details or press the Esc key to -go back to the welcome screen.</para> + <para>Pressing <emphasis role="bold">F1</emphasis> opens a help window for various +boot options. Select an item with the arrow keys and press <emphasis +role="bold">Enter</emphasis> for more details or press <emphasis +role="bold">Esc</emphasis> to go back to the welcome screen.</para> <mediaobject> <imageobject> <imagedata fileref="dx-welcomeHelp1.png"/> </imageobject></mediaobject> - <para>有关 splash 选项的细节。按 Esc 或选择 -<guilabel>返回引导选项</guilabel>可以回到选项列表。可以手动将这些选项添加到<guilabel>引导选项</guilabel> 行。</para> + <para>The detailed view about the splash option. Press <emphasis +role="bold">Esc</emphasis> or select <guilabel>Return to Boot +Options</guilabel> to go back to the options list. These options can be +added by hand in the <guilabel>Boot Options</guilabel> line.</para> <mediaobject> <imageobject> <imagedata fileref="dx-welcomeHelp2.png"/> </imageobject></mediaobject> <note> - <para>按 F2 键可以将帮助翻译为所选语言。</para> + <para>The help is translated in the chosen language with <emphasis +role="bold">F2</emphasis>.</para> </note> <para>有关传统引导和 UEFI 引导的内核选项，请参考：<link @@ -100,38 +135,30 @@ ns2:href="https://wiki.mageia.org/en/How_to_set_up_kernel_options">https://wiki. </listitem> </itemizedlist></para> </section> - - <section> - <title>Using a Wired Network</title> - - <para>Here is the default welcome screen when using a Wired Network-based -Installation CD (netinstall.iso or netinstall-nonfree.iso images):</para> - - <para>此处无法改变语言，界面中列出了可用的选项。有关使用有线网络安装 CD 来安装的更多细节，请参考 <link -ns2:href="https://wiki.mageia.org/en/Boot.iso_install">Mageia Wiki</link>。</para> - - <warning> - <para>键盘布局为美式键盘。</para> - </warning> - - <mediaobject> -<imageobject> <imagedata fileref="../dx-help.png"/> </imageobject></mediaobject> - </section> </section> <section> <title>安装步骤</title> - <para>安装过程被分为多个步骤，可以在侧边栏看到安装进度。</para> + <para>The install process is divided into a number of steps, the status of which +is indicated in a panel to the left of the screen.</para> - <para>每一步包含一个或多个窗口，并且可使用<guibutton>高级</guibutton>按钮查看不常用的选项。</para> + <para>Each step has one or more screens which may also have +<guibutton>Advanced</guibutton> sections with extra, less commonly required, +options.</para> - <para>多数窗口中有<guibutton>帮助</guibutton>按钮，可以提供当前操作的有关说明。</para> + <para>Most screens have <guibutton>Help</guibutton> buttons for further details +about the particular step.</para> <note> - <para>若安装过程在某一步中断，您可以选择重启，但请三思而后行。一旦分区被格式化，或升级过程开始，电脑中的内容将发生变化，此时重启可能导致系统无法使用。若您确定要重启，可以按 -<guibutton>Alt Ctrl F2</guibutton> 切换到终端，然后按下 <guibutton>Alt Ctrl -Delete</guibutton> 来触发重启操作。</para> + <para>If at some points during the install you decide to stop the installation, it +is possible to reboot, but please think twice before you do this. Once a +partition has been formatted or updates have started to be installed, your +computer is no longer in the same state and rebooting it could very well +leave you with an unusable system. If in spite of this you are very sure +rebooting is what you want, go to a text terminal by pressing the three keys +<guibutton>Alt Ctrl F2</guibutton> at the same time. After that, press +<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot.</para> </note> </section> @@ -148,8 +175,13 @@ Delete</guibutton> 来触发重启操作。</para> </listitem> <listitem> - <para>若硬件较老，可能无法使用图形化安装程序。这种情况下，可以尝试文本安装模式：在首个欢迎界面中按 Esc，然后按 -Enter。在出现的黑色屏幕中，输入“text”，然后按 Enter，即可进入文本安装模式。</para> + <para>If the hardware is very old, a graphical installation may not be +possible. In this case it is worth trying a text mode installation. To use +this press <emphasis role="bold">Esc</emphasis> at the first welcome screen +and confirm with <emphasis role="bold">ENTER</emphasis>. You will be +presented with a black screen with the word "boot:". Type "text" and press +<emphasis role="bold">ENTER</emphasis> to continue with the installation in +text mode.</para> </listitem> </itemizedlist> </section> @@ -164,18 +196,20 @@ Enter。在出现的黑色屏幕中，输入“text”，然后按 Enter，即 <section> <title>内存问题</title> - <para>部分情况下，硬件可能无法正确地检测可用 RAM 大小。要手动指定它，可以使用 <code>mem=xxxM</code> 参数，其中 xxx 是 RAM -的总大小。例如，<code>mem=256M</code> 表示 RAM 的大小为 256MB。</para> + <para>This will rarely be needed, but in some cases the hardware may report the +available RAM incorrectly. To specify this manually, you can use the +<code>mem=xxxM</code> parameter, where xxx is the correct amount of +RAM. e.g. <code>mem=256M</code> would specify 256MB of RAM.</para> </section> <section> <title>动态分区</title> - <para>若您在微软 Windows 中将硬盘从“basic”格式转变为“dynamic”格式，该硬盘将无法用于 Mageia -安装。要将硬盘转变回“basic”格式，请参见微软的文档：<link -ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>。</para> + <para>If you converted your hard disk from <emphasis role="bold">basic</emphasis> +format to <emphasis role="bold">dynamic</emphasis> format in Microsoft +Windows, then it is not possible to install Mageia on this disc. To revert +to a basic disk, see the Microsoft documentation: <link +ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para> </section> </section> - - <section/> -</section>
\ No newline at end of file +</section> diff --git a/docs/docs/stable/installer/zh_CN/media_selection.xml b/docs/docs/stable/installer/zh_CN/media_selection.xml index 8701ca1c..931daa8a 100644 --- a/docs/docs/stable/installer/zh_CN/media_selection.xml +++ b/docs/docs/stable/installer/zh_CN/media_selection.xml @@ -4,17 +4,21 @@ </info> + + + -<mediaobject> + <mediaobject> <!-- papoteur 2013-04-11 - created --> <!-- marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)--> <!-- marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell --> <!--marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)--> -<imageobject> <imagedata align="center" fileref="dx2-media_selection.png" -format="PNG" revision="1" xml:id="media_selection-im1"/> </imageobject></mediaobject> +<imageobject> <imagedata format="PNG" xml:id="media_selection-im1" +align="center" revision="1" fileref="dx2-media_selection.png"/> +</imageobject></mediaobject> <para>此处列出了可用的仓库。根据所选的安装介质，并非所有仓库都可以使用。所选仓库将决定下一步中可用的软件包。</para> @@ -29,8 +33,11 @@ format="PNG" revision="1" xml:id="media_selection-im1"/> </imageobject></mediaob </listitem> <listitem> - <para><emphasis>Tainted</emphasis> 仓库包含了在自由许可证下发布的软件。将这些软件包归入 Tainted -仓库是因为它们可能会违反部分国家（地区）的专利或版权法，例如：用于播放音频/视频文件的多媒体解码器，用于播放商业视频 DVD 的软件等。</para> + <para>The <emphasis>Tainted</emphasis> repository includes packages released under +a free license. The main criteria for placing packages in this repository is +that they may infringe patents and copyright laws in some countries, +e.g. multimedia codecs needed to play various audio/video files; packages +needed to play commercial video DVD's, etc.</para> </listitem> </itemizedlist> -</section>
\ No newline at end of file +</section> diff --git a/docs/docs/stable/installer/zh_CN/minimal-install.xml b/docs/docs/stable/installer/zh_CN/minimal-install.xml index 500cbac6..8a5b7207 100644 --- a/docs/docs/stable/installer/zh_CN/minimal-install.xml +++ b/docs/docs/stable/installer/zh_CN/minimal-install.xml @@ -1,13 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<section version="5.0" xml:lang="zh_CN" xml:id="minimal-install" - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - 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 version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" version="5.0" xml:lang="zh_CN"> <!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page--> <!--2013-05-05 marja - added screenshot and s/next/related/ --> @@ -16,15 +7,27 @@ </info> + - <para>在软件包组选择窗口中，您可以通过取消选择所有项来实现最小化安装，参见 <xref -linkend="choosePackageGroups"></xref>。</para> - <para>若需要，您可以在该窗口中勾选“独立选择软件包”选项。</para> - <para>最小化安装通常被用于在服务器或特定工作站上安装 Mageia。您可能会将此选项与“独立软件包选择”选项配合使用，以便微调您的安装配置，参见 <xref -linkend="choosePackagesTree"></xref>。</para> - <para>若您选择了安装类别，相应的窗口将会为您展示一些额外的有用软件，例如 X 服务的文档。</para> - <para>若选中“包含 X”，将会同时选定 IceWM 作为轻量级的桌面环境。</para> + <para>You can choose a Minimal Installation by de-selecting everything in the +Package Group Selection screen, see <xref linkend="choosePackageGroups"/>.</para> + + <para>If desired, you can additionally tick the <emphasis role="bold">Individual +package selection</emphasis> option in the same screen.</para> + + <para>Minimal Installation is intended for those with specific uses in mind for +<application>Mageia</application>, such as a server or a specialised +workstation. You will probably use this option combined with the <emphasis +role="bold">Individual package selection</emphasis> option mentioned above, +to fine-tune your installation, see <xref linkend="choosePackagesTree"/>.</para> + + <para>If you choose this installation method, then the relevant screen will offer +you a few useful extras to install, such as documentation and X.</para> + + <para>If <emphasis role="bold">With X</emphasis> is chosen, then IceWM (a +lightweight desktop environment) will also be included.</para> + <para>一些基础的文档由 man 和 info 命令提供。其中包含了来自 <link xlink:href="http://www.tldp.org/manpages/man.html">Linux Documentation Project</link> 的 man 帮助页和来自 <link @@ -32,9 +35,7 @@ xlink:href="http://www.gnu.org/software/coreutils/manual/">GNU coreutils</link> 的 info 帮助页。</para> <mediaobject> -<imageobject> <imagedata revision="1" fileref="dx2-minimal-install.png" -align="center" format="PNG" xml:id="minimal-install-im1"></imagedata> +<imageobject> <imagedata format="PNG" xml:id="minimal-install-im1" +align="center" fileref="dx2-minimal-install.png" revision="1"/> </imageobject></mediaobject> - - </section> - +</section>
\ No newline at end of file diff --git a/docs/docs/stable/installer/zh_CN/misc-params.xml b/docs/docs/stable/installer/zh_CN/misc-params.xml index 599c4313..08e3d08b 100644 --- a/docs/docs/stable/installer/zh_CN/misc-params.xml +++ b/docs/docs/stable/installer/zh_CN/misc-params.xml @@ -9,11 +9,14 @@ <!-- 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> + <para xml:id="misc-params-pa1" revision="1">DrakX presents a proposal for the configuration of your system depending on +the choices you made and on the hardware detected. You can check the +settings here and change them if you want by pressing +<guibutton>Configure</guibutton>.</para> <note> - <para>一般而言，您可以直接使用推荐配置，除非您遇到以下三种情况：<itemizedlist> + <para>As a general rule, it is recommended that you accept the default settings +unless:<itemizedlist> <listitem> <para>您预知该默认配置存在问题</para> </listitem> @@ -23,7 +26,7 @@ </listitem> <listitem> - <para>后续章节中所提到的其他情况</para> + <para>some other factor mentionned in the detailed sections below is an issue.</para> </listitem> </itemizedlist></para> </note> @@ -37,13 +40,15 @@ <listitem> <para xml:id="misc-params-system-pa2" revision="1"><guilabel>时区</guilabel></para> - <para xml:id="misc-params-system-pa2a" revision="1">DrakX 根据您的语言设置自动选择了时区。您也可以手动改变时区。参见 <xref linkend="configureTimezoneUTC"/></para> + <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a time zone for you, depending on your preferred language. You +can change it if needed. See also <xref linkend="configureTimezoneUTC"/></para> </listitem> <listitem> <para revision="1" xml:id="misc-params-system-pa3"><guilabel>国家/地区</guilabel></para> - <para xml:id="misc-params-system-pa3a" revision="1">若您不在所选国家/地区中，请务必对其进行正确设置。参见 <xref linkend="selectCountry"/></para> + <para xml:id="misc-params-system-pa3a" revision="1">If the selected country is wrong, it is very important that you correct the +setting. See <xref linkend="selectCountry"/></para> </listitem> <listitem> @@ -51,7 +56,7 @@ <para xml:id="misc-params-system-pa4a" revision="2">DrakX 为引导器进行了自动设置。</para> - <para xml:id="misc-params-system-pa4b" revision="2">除非您懂得如何配置 GRUB 2，否则请勿更改这些配置</para> + <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2</para> <para xml:id="misc-params-system-pa4c" revision="2">更多信息，参见 <xref linkend="setupBootloader"/></para> </listitem> @@ -65,7 +70,8 @@ <listitem> <para xml:id="misc-params-system-pa6" revision="1"><guilabel>服务</guilabel>:</para> - <para xml:id="misc-params-system-pa6a" revision="1">系统服务指在后台运行的小程序（守护进程）。此工具允许您启用或禁用特定任务。</para> + <para xml:id="misc-params-system-pa6a" revision="1">System services refer to those small programs which run in the background +(daemons). This tool allows you to enable or disable certain processes.</para> <para xml:id="misc-params-system-pa6b" revision="1">在做出更改之前，请认真审视选项 - 任何错误都可能导致系统无法正常运行。</para> @@ -83,7 +89,8 @@ <listitem> <para xml:id="misc-params-hardware-pa1" revision="1"><guilabel>键盘</guilabel>:</para> - <para xml:id="misc-params-hardware-pa1a" revision="1">在这里，您可以根据您所在的位置、使用的语言和键盘类型来设置键盘布局。</para> + <para xml:id="misc-params-hardware-pa1a" revision="1">Configure your keyboard layout according to your location, language and type +of keyboard.</para> <note> <para>如果您发现键盘布局错误、需要更正，请注意：在更改配置后，之前设置的密码也可能发生改变。</para> @@ -99,7 +106,9 @@ <listitem> <para xml:id="misc-params-hardware-pa3" revision="1"><guilabel>声卡</guilabel>:</para> - <para xml:id="misc-params-hardware-pa3a" revision="1">安装器将会使用默认驱动（如果有的话）。只有存在多个可用驱动（且均不是默认驱动）时，才会提示您进行选择。</para> + <para xml:id="misc-params-hardware-pa3a" revision="1">The installer uses the default driver - if there is a default one. The +option to select a different driver is only given when there is more than +one driver for your card, but where none of them is the default one.</para> </listitem> <listitem> @@ -125,10 +134,14 @@ align="center" fileref="dx2-summaryBottom.png" revision="1"/> </imageobject></me <listitem> <para xml:id="misc-params-network-pa1" revision="1"><guilabel>网络</guilabel>:</para> - <para xml:id="misc-params-network-pa2" revision="1">您可以在这里配置网络。若您需要在网卡上使用非自由的驱动程序，并且尚未启用 Nonfree 软件仓库，那么您最好等到重启后再进行这一操作。</para> + <para xml:id="misc-params-network-pa2" revision="1">You can configure your network here, but for network cards with non-free +drivers it is better to do that after reboot, using the <application>Mageia +Control Center</application>, if you have not yet enabled the Nonfree media +repositories.</para> <warning> - <para xml:id="misc-params-network-pa3" revision="1">当您添加了网卡后，请不要忘记用防火墙对该接口进行管理。</para> + <para xml:id="misc-params-network-pa3" revision="1">When you add a network card, do not forget to set your firewall to monitor +that interface as well.</para> </warning> </listitem> @@ -137,7 +150,8 @@ align="center" fileref="dx2-summaryBottom.png" revision="1"/> </imageobject></me <para xml:id="misc-params-network-pa4a" revision="1">代理服务器将作为您的电脑和广域网之间的桥梁。您可以在此处配置您需要使用的代理服务。</para> - <para xml:id="misc-params-network-pa4b" revision="1">您可能需要咨询系统管理员来获取此处应当填写的参数</para> + <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to get the parameters you +need to enter here.</para> </listitem> </itemizedlist> </section> diff --git a/docs/docs/stable/installer/zh_CN/securityLevel.xml b/docs/docs/stable/installer/zh_CN/securityLevel.xml index 00e6556a..3c889df0 100644 --- a/docs/docs/stable/installer/zh_CN/securityLevel.xml +++ b/docs/docs/stable/installer/zh_CN/securityLevel.xml @@ -1,31 +1,40 @@ -<?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="securityLevel" 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="securityLevel"> + <info> + <title xml:id="securityLevel-ti1">安全级别</title> + </info> + - <info> - <title xml:id="securityLevel-ti1">安全级别</title> - </info> + - - - -<mediaobject> + <mediaobject> <!-- 2012-12-25 marja - moved this part out of misc-params.xml" --> <!-- 2013-05-05 marja - added screenshot --> -<imageobject> <imagedata revision="1" fileref="dx2-securityLevel.png" -align="center" format="PNG" xml:id="securityLevel-im1"></imagedata> -</imageobject></mediaobject> +<imageobject> <imagedata format="PNG" xml:id="securityLevel-im1" +align="center" fileref="dx2-securityLevel.png" revision="1"/> </imageobject></mediaobject> + + <para><emphasis role="bold">Please choose the desired security level</emphasis></para> + + <para xml:id="securityLevel-pa1" revision="1"><emphasis role="bold">Standard</emphasis> is the default, and recommended +setting for the average user. The <emphasis role="bold">Secure</emphasis> +setting will create a highly protected system - for instance if the system +is to be used as a public server.</para> + + <para><emphasis role="bold">Security Administrator</emphasis></para> - <para revision="1" xml:id="securityLevel-pa1">您可以在这里调整安全等级。</para> + <para xml:id="securityLevel-pa2" revision="1">This item allows you to configure an email address to which the system will +send <emphasis>security alert messages</emphasis> when it detects situations +which require notification to a system administrator.</para> - <para revision="1" xml:id="securityLevel-pa2">若您不确定如何选择，请使用默认设置。</para> + <para>A good, and easy-to-implement, choice is to enter <user>@localhost - +where <user> is the login name of the user to receive these messages.</para> - <para revision="2" xml:id="securityLevel-pa3">在安装之后，您也可以在 Mageia 控制中心中的 <guilabel>安全</guilabel> 选项卡里调整安全设置。</para> - </section> + <note> + <para>The system sends such messages as <emphasis role="bold">Unix Mailspool +messages</emphasis>, not as "ordinary" SMTP mail: this user must therefore +be configured for receiving such mail!</para> + </note> + <para revision="2" xml:id="securityLevel-pa3">After install, it will always be possible to adjust your security settings +in the <guilabel>Security</guilabel> section of the Mageia Control Center.</para> +</section>
\ No newline at end of file diff --git a/docs/docs/stable/installer/zh_CN/selectCountry.xml b/docs/docs/stable/installer/zh_CN/selectCountry.xml index 320b9472..e7175780 100644 --- a/docs/docs/stable/installer/zh_CN/selectCountry.xml +++ b/docs/docs/stable/installer/zh_CN/selectCountry.xml @@ -12,11 +12,14 @@ align="center" fileref="dx2-selectCountry.png" revision="1"/> </imageobject></me <para revision="2" xml:id="selectCountry-pa1">请选择您所在的国家或地区。此选项将影响货币设置和无线管理域设置。如果您设置了错误的国家，您可能无法正常使用无线网络。</para> - <para revision="1" xml:id="selectCountry-pa2">若列表中不包含您的国家，请点击 <guilabel>其他国家</guilabel> 按钮并选择相应的国家/区域。</para> + <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <guilabel>Other +Countries</guilabel> option and choose your country / region there.</para> <note> - <para revision="1" xml:id="selectCountry-pa3">若您的国家仅在 <guilabel>其他国家</guilabel> 列表中列出，在点击 <guibutton>确定</guibutton> -按钮之后，请忽略前一个列表中的选项。DrakX 会应用您后来的选择。</para> + <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <guilabel>Other Countries</guilabel> list, +after clicking <guibutton>OK</guibutton> it may seem that a country from the +first list was chosen. Please ignore this, as DrakX will apply your actual +choice.</para> </note> <section xml:id="inputMethod"> @@ -24,13 +27,19 @@ align="center" fileref="dx2-selectCountry.png" revision="1"/> </imageobject></me <title xml:id="inputMethod-ti7">输入法</title> </info> - <para xml:id="selectCountry-pa4" revision="1">在 <guilabel>其他国家</guilabel> -窗口中，您也可以选择一种输入法（位于列表底部）。输入法用于输入各类语言中的字符（中文、日文、韩文等）。IBus -是默认选项，一般情况下用户无需手动配置。其他输入法（SCIM、GCIN、HIME 等）可以提供类似的功能，您可以在选择软件包前通过添加 HTTP/FTP -媒体来安装它们。</para> + <para xml:id="selectCountry-pa4" revision="1">In the <guilabel>Other Countries</guilabel> screen you can also select an +input method (at the bottom of the list). Input methods allow users to input +multilingual characters (Chinese, Japanese, Korean, etc). IBus is the +default input method, so users should not need to configure it +manually. Other input methods (SCIM, GCIN, HIME, etc) also provide similar +functions and can be installed if you added HTTP/FTP media before package +selection.</para> <note> - <para xml:id="selectCountry-pa5" revision="1">若您在安装期间缺少输入法，您可以在安装完成后通过“配置我的电脑”->“系统”设置来安装输入法，或者以 root 身份运行 localedrake。</para> + <para xml:id="selectCountry-pa5" revision="1">If you missed the input method setup during installation, you can access it +after you boot your installed system via <emphasis role="bold">Configure +your Computer</emphasis> -> <emphasis role="bold">System</emphasis>, or by +running localedrake as root.</para> </note> </section> </section>
\ No newline at end of file diff --git a/docs/docs/stable/installer/zh_CN/selectInstallClass.xml b/docs/docs/stable/installer/zh_CN/selectInstallClass.xml index 30cd9f8f..b26ed4ab 100644 --- a/docs/docs/stable/installer/zh_CN/selectInstallClass.xml +++ b/docs/docs/stable/installer/zh_CN/selectInstallClass.xml @@ -1,12 +1,4 @@ -<?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/1998/Math/MathML" - xmlns:ns4="http://www.w3.org/1999/xhtml" - xmlns:ns3="http://www.w3.org/2000/svg" - xmlns:ns="http://docbook.org/ns/docbook" - version="5.0" xml:lang="zh_CN" xml:id="selectInstallClass"> - +<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_CN" xml:id="selectInstallClass"> @@ -14,6 +6,7 @@ + <info> @@ -27,36 +20,50 @@ </info> <mediaobject> -<imageobject> <imagedata fileref="dx2-selectInstallClass.png" align="center" -format="PNG"></imagedata> </imageobject></mediaobject> +<imageobject> <imagedata format="PNG" align="center" +fileref="dx2-selectInstallClass.png"/> </imageobject></mediaobject> <itemizedlist> <listitem> <para>安装</para> - <para>使用此选项来进行全新 <application>Mageia</application> 安装。</para> + <para>Use this option to perform a fresh installation of +<application>Mageia</application>. This will format the root partition (/), +but can preserve a separated /home partition.</para> </listitem> <listitem> <para>升级</para> - <para>若您在电脑上安装了多个 <application>Mageia</application>，安装程序将会允许您选择需要升级的系统。</para> + <para>This can be used to upgrade an existing installation of +<application>Mageia</application>.</para> -<warning> - <para>我们只测试了从当前 <emphasis>尚被支持</emphasis>的发行版进行的升级过程。如果您希望从已经结束支持的 Mageia -版本升级到最新版本，我们建议您最好进行全新安装，同时保留您的 <literal>/home</literal> 分区。</para> -</warning> + <warning> + <para>Only upgrading from a previous Mageia version that was <emphasis>still +supported</emphasis> when this installer's version was released, has been +thoroughly tested. If you want to upgrade a Mageia version that has reached +its End Of Life, then it is better to do a clean install instead while +preserving your <literal>/home</literal> partition.</para> + </warning> </listitem> </itemizedlist> <note> - <para>若安装过程在某一步中断，您可以选择重启，但请三思而后行。一旦分区被格式化，或升级过程开始，电脑中的内容将发生变化，此时重启可能导致系统无法使用。若您确定要重启，可以按 -<guibutton>Alt Ctrl F2</guibutton> 切换到终端，然后按下 <guibutton>Alt Ctrl -Delete</guibutton> 来触发重启操作。</para> + <para>If during install you decide to stop the installation, it is possible to +reboot, but please think twice before you do this. Once a partition has been +formatted or updates have started to be installed, your computer isn't in +the same state anymore and rebooting it could very well leave you with an +unusable system. If in spite of that, and only if you are very sure +rebooting is what you want, go to a text terminal by pressing <guilabel>Alt +Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl +Delete</guilabel> simultaneously to reboot.</para> </note> <tip> - <para>若您忘记选择某一附加语言，您可以回到“安装或升级”界面，然后按下来 <guilabel>Alt Ctrl Home</guilabel> -并进行选择。请<emphasis>不要</emphasis>在安装后再进行添加。</para> + <para>If you have discovered that you forgot to select an additional language, you +can return from the <emphasis role="bold">Install or Upgrade</emphasis> +screen to the language choice screen by pressing <guilabel>Alt Ctrl +Home</guilabel> simultaneously. <emphasis role="bold">Do not</emphasis> do +this later in the install.</para> </tip> -</section> +</section>
\ No newline at end of file diff --git a/docs/docs/stable/installer/zh_CN/selectKeyboard.xml b/docs/docs/stable/installer/zh_CN/selectKeyboard.xml index 5221353a..fb02eeb4 100644 --- a/docs/docs/stable/installer/zh_CN/selectKeyboard.xml +++ b/docs/docs/stable/installer/zh_CN/selectKeyboard.xml @@ -1,11 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<section version="5.0" xml:lang="zh_CN" xml:id="selectKeyboard" - xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="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"> +<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="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" xml:id="selectKeyboard" version="5.0" xml:lang="zh_CN"> @@ -16,28 +9,36 @@ <title xml:id="selectKeyboard-ti1">键盘</title> </info> - <para revision="1" xml:id="selectKeyboard-pa1">DrakX 会根据您的语言为您选择合适的键盘。若找不到合适的键盘，则会自动选择美式键盘。</para> + <para xml:id="selectKeyboard-pa1" revision="1">DrakX 会根据您的语言为您选择合适的键盘。若找不到合适的键盘，则会自动选择美式键盘。</para> <mediaobject> -<imageobject> <imagedata align="center" fileref="dx2-selectKeyboard.png" /> +<imageobject> <imagedata fileref="dx2-selectKeyboard.png" align="center"/> </imageobject></mediaobject> <itemizedlist> <listitem> - <para revision="1" xml:id="selectKeyboard-pa2">请确保该选项正确。如果您不知道您的键盘肿瘤，请查阅您的电脑配件规格，或询问电脑供应商，或查看键盘上的标签。您也可以参考这里的内容：<link + <para xml:id="selectKeyboard-pa2" revision="1">请确保该选项正确。如果您不知道您的键盘肿瘤，请查阅您的电脑配件规格，或询问电脑供应商，或查看键盘上的标签。您也可以参考这里的内容：<link xlink:href="http://en.wikipedia.org/wiki/Keyboard_layout">en.wikipedia.org/wiki/Keyboard_layout</link></para> </listitem> <listitem> - <para revision="1" xml:id="selectKeyboard-pa3">若列表中没有您的键盘，请点击 <guibutton>更多</guibutton> 来查看完整列表，并选择相应的键盘种类。</para> + <para xml:id="selectKeyboard-pa3" revision="1">If your keyboard isn't in the list shown, click on +<guibutton>More</guibutton> to get a fuller list, and select your keyboard +there.</para> <para revision="1"><warning> - <para revision="1" xml:id="selectKeyboard-pa5">在点击 <guibutton>确定</guibutton> 按钮之后，请忽略前一个列表中的选项。DrakX 会应用您后来的选择。</para> + <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <guibutton>More</guibutton> dialog, +you'll return to the first keyboard choice dialog and it will seem as though +a keyboard from that screen was chosen. You can safely ignore this and +continue the installation: the keyboard chosen from the full list will be +applied.</para> </warning></para> </listitem> <listitem> - <para revision="1" xml:id="selectKeyboard-pa4">若您选择了基于非拉丁字符的键盘布局，之后您将会看到有关切换拉丁/非拉丁键盘布局的提示窗口。</para> + <para xml:id="selectKeyboard-pa4" revision="1">If you choose a keyboard based on non-Latin characters, you will see an +extra dialogue screen asking how you would prefer to switch between the +Latin and non-Latin keyboard layouts</para> </listitem> </itemizedlist> -</section> +</section>
\ No newline at end of file diff --git a/docs/docs/stable/installer/zh_CN/selectLanguage.xml b/docs/docs/stable/installer/zh_CN/selectLanguage.xml index baa09eac..7a3721f0 100644 --- a/docs/docs/stable/installer/zh_CN/selectLanguage.xml +++ b/docs/docs/stable/installer/zh_CN/selectLanguage.xml @@ -1,9 +1,14 @@ -<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="zh_CN" xml:id="selectLanguage"> +<?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="selectLanguage"> + + + + + <info> <!-- Made by marja on 2012 04 01, using barjac's text --> <!-- NEEDS TO BE REVIEWED! --> @@ -14,26 +19,42 @@ up mess made of this header by xxe --> <title xml:id="selectLanguage-ti1">请选择要使用的语言</title> </info> + <para condition="classical">请在地区列表中选择您的首选语言。<application>Mageia</application> 将会在之后的安装过程中使用该语言。</para> + <para condition="live">Select your preferred language. <application>Mageia</application> will use this selection during the installation and for your installed system.</para> - <para condition="classical">若您需要在系统中安装多种语言（为您和其他用户），请现在点击<guibutton>多语言</guibutton>按钮来添加语言。完成安装后添加额外语言是相对困难的。</para> + + <para condition="classical">If it is likely that you (or others) will require several languages to be +installed on your system, then you should use the <guibutton>Multiple +languages</guibutton> option to add them now. It will be difficult to add +extra language support after installation.</para> + <mediaobject> <imageobject condition="classical"> <imagedata format="PNG" fileref="dx2-selectLanguage.png" align="center"/> </imageobject> <imageobject condition="live"> <imagedata fileref="live-language.png" format=""/> </imageobject></mediaobject> + <warning condition="classical"> - <para>如果您选择了多种语言，必须同时选择其中一种作为您的首选语言（在前一个语言选择界面中），该语言会同时出现在多语言配置界面中。</para> + <para>Even if you choose more than one language, you must first choose one as your +preferred language in the first language screen. It will also be marked as +chosen in the multiple languages screen.</para> </warning> + <itemizedlist> <listitem condition="classical"> <para>若您的键盘输入语言与首选语言不同，最好也同时安装该输入语言。</para> </listitem> + <listitem> <para>Mageia 默认使用 UTF-8（Unicode）格式。</para> - <para condition="classical">若您认为这不适合您的语言，可以在“多语言”界面中将其禁用。该操作将应用到所有安装的语言。</para> + + <para condition="classical">This may be disabled in the <emphasis role="bold">Multiple +languages</emphasis> screen if you know that it is inappropriate for your +language. Disabling UTF-8 applies to all installed languages.</para> </listitem> + <listitem> <para>您可以在安装完成后，在 Mageia 控制中心 -> 系统 -> 管理本地化 中改变系统语言。</para> </listitem> diff --git a/docs/docs/stable/installer/zh_CN/setupBootloader.xml b/docs/docs/stable/installer/zh_CN/setupBootloader.xml index 10dbdbf8..b4232fa9 100644 --- a/docs/docs/stable/installer/zh_CN/setupBootloader.xml +++ b/docs/docs/stable/installer/zh_CN/setupBootloader.xml @@ -1,8 +1,6 @@ -<?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="setupBootloader"> +<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="zh_CN" xml:id="setupBootloader"> - - <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 @@ -10,189 +8,135 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC--> <title xml:id="setupBootloader-ti1">引导程序的主要选项</title> </info> - <section> <title>引导器界面</title> - <para>默认情况下，Mageia 仅使用：</para> - <itemizedlist> <listitem> - <para>GRUB2（包含/不包含图形界面），当使用传统硬件 + MBR/GPT格式分区时</para> + <para>GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system</para> </listitem> - <listitem> - <para>GRUB2-efi，当使用 UEFI 硬件时。</para> + <para>GRUB2-efi for a UEFI system.</para> </listitem> </itemizedlist> - <tip> <para>The Mageia graphical menus are nice :)</para> </tip> - <section> - <title>GRUB2，当使用传统硬件 + MBR/GPT 格式分区时</title> - + <title>GRUB2 on Legacy/MBR and Legacy/GPT systems</title> <mediaobject> <imageobject condition="classical"> <imagedata fileref="dx2-setupBootloader.png" align="center"/> </imageobject> <imageobject condition="live"> <imagedata xml:id="setupBootloader-im1" fileref="live-setupBootloader.png"/> </imageobject></mediaobject> - - <para>若您不确定如何操作，请不要修改“引导设备”。</para> + <para>Don't modify the <emphasis role="bold">Boot Device</emphasis> unless you +really know what you are doing.</para> </section> - <section> - <title>GRUB2-efi，当使用 UEFI 硬件时</title> - - <para>对于 UEFI，用户界面会稍有不同，您将无法选择引导器（因为只能使用 Grub2-efi）。</para> - + <title>GRUB2-efi on UEFI systems</title> + <para>With a UEFI system, the user interface is slightly different as you cannot +choose between the <emphasis role="bold">with</emphasis> or <emphasis +role="bold">without graphical menu</emphasis> options.</para> <mediaobject> <imageobject condition="classical"> <imagedata fileref="dx2-setupBootloader2.png" align="center"/> </imageobject> <imageobject condition="live"> <imagedata fileref="live-setupBootloader2.png"/> </imageobject></mediaobject> - - <para>如果 Mageia 是您在电脑上安装的第一个系统，安装程序将自动创建一个 ESP（EFI 系统分区）来容纳引导器（Grub2-efi）。如果已安装了其他 -UEFI 操作系统（例如 Windows 8），Mageia 安装器将会探测现存的（由 Windows 创建的） ESP，并添加 -grub2-efi。尽管多个 ESP 可以共存，但只需一个 ESP 即可满足启动所有操作系统的需求。</para> - - <para>若您不确定如何操作，请不要修改“引导设备”。</para> + <para>If Mageia is the only system installed on your computer, the installer +created an ESP (EFI System Partition) to house the bootloader +(GRUB2-efi). If there are already UEFI operating systems installed on your +computer (Windows 8 for example), the Mageia installer detects the existing +ESP created by Windows and adds GRUB2-efi. Although it is possible to have +several ESPs, only one is required (and advised), whatever the number of +operating systems you have.</para> + <para>Don't modify the <emphasis role="bold">Boot Device</emphasis> unless you +really know what you are doing.</para> </section> </section> - <section> <title xml:id="setupMageiaBootloader">使用 Mageia 提供的引导器</title> - - <para>默认情况下，根据您的硬件情况，Mageia 会将：</para> - + <para>By default, and according to your system, Mageia writes one of the +following:</para> <itemizedlist> <listitem> - <para>GRUB 2 引导器安装至 MBR（主引导记录）区域或第一硬盘的 BIOS 引导分区。</para> + <para>a GRUB2 bootloader either into the MBR (Master Boot Record) of your first +hard drive or in the BIOS boot partition.</para> </listitem> - <listitem> - <para>GRUB2-efi 引导器安装至 ESP</para> + <para>a GRUB2-efi bootloader into the ESP</para> </listitem> </itemizedlist> - - <para>若您已安装了其他操作系统，Mageia 会尝试将它们也添加到 Mageia 的引导菜单。如果您不希望 Mageia -这么做，请点击<guibutton>下一步</guibutton>，然后取消勾选<guilabel>检测其他操作系统</guilabel></para> - + <para>If you already have other operating systems installed, Mageia attempts to +add them to your new Mageia boot menu. If you don't want this behaviour, +click on <guibutton>Next</guibutton> and then untick the <emphasis +role="bold">Probe Foreign OS</emphasis> option.</para> <mediaobject> <imageobject condition="classical"> <imagedata align="center" fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject condition="live"> <imagedata fileref="live-setupBootloader3.png" align="center"/> </imageobject></mediaobject> </section> - <section> <title>使用现存的引导器</title> - - <para>有关添加 Mageia -系统至现存引导器的问题超出了此帮助的范围。多数情况下，这设计到运行相应的引导器安装程序，并自动检测和添加引导项。请参见有关操作系统的文档以便进一步操作。</para> + <para>The exact procedure for adding your Mageia system to an existing bootloader +is beyond the scope of this documentation, however in most cases it will +involve running the relevant bootloader installation program which should +detect and add it automatically. See the documentation for the operating +system in question.</para> </section> - <section> <title xml:id="setupChainLoading">使用链式加载（chain loading）</title> - - <para>若您不需要 Mageia 安装引导器，而是希望从其他系统引导 -Mageia，请点击<guibutton>下一步</guibutton>，然后点击<guibutton>高级</guibutton>并勾选 -<guilabel>不要修改 ESP 或 MBR</guilabel>。</para> - + <para>If you don't want a bootable Mageia, but to chain-load it from another OS, +click on <guibutton>Next</guibutton>, then on +<guibutton>Advanced</guibutton> and tick the box <guilabel>Do not touch ESP +or MBR</guilabel>.</para> <mediaobject> <imageobject condition="classical"> <imagedata fileref="dx2-setupBootloader4.png" align="center"/> </imageobject> <imageobject condition="live"> <imagedata fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject> - <para>安装程序将会提醒您缺少引导器，请忽略它并点击<guibutton>确定</guibutton>。</para> - <mediaobject> <imageobject> <imagedata fileref="live-setupBootloader5.png"/> </imageobject></mediaobject> </section> - <section> <title>选项</title> - <section> <title>第一页</title> - - <para><itemizedlist> - <listitem> - <para><guilabel>自动引导之前等待</guilabel>：此文本框用于设置在等待多少秒之后自动进入默认选定的操作系统。</para> - </listitem> - - <listitem> - <para><guilabel>Security</guilabel>: This allows you to set a password for the -bootloader. This means a username and password will be asked at the boot -time to select a booting entry or change settings. The username is "root" -and the password is the one chosen here after.</para> - </listitem> - - <listitem> - <para><guilabel>密码</guilabel>：此文本框用于输入密码</para> - </listitem> - - <listitem> - <para><guilabel>确认密码</guilabel>：再次输入密码，安装程序将检查您两次输入的密码是否一致。</para> - </listitem> - - <listitem> - <para><guilabel>高级</guilabel></para> - - <itemizedlist> - <listitem> - <para>ACPI（高级配置与电源接口）是标准的电源管理协议。它可以关闭未使用的设备以节能，用于取代 APM。如果您的硬件不兼容 ACPI，或者您认为 ACPI -会造成某些问题（如偶尔会自动重启，或系统卡死），则可以取消勾选它。</para> - </listitem> - - <listitem> - <para><guilabel>启用 SMP</guilabel>：此选项启用或禁用多核处理器上的对称多处理器特性。</para> - </listitem> - - <listitem> - <para><guilabel>启用 APIC</guilabel>：启用或禁用高级可编程中断控制器。APIC 设备可以支持更复杂的优先级模型和高级 -IRQ（中断请求）管理功能。</para> - </listitem> - - <listitem> - <para><guilabel>启用本地 APIC</guilabel>：您可以在这里设置本地 APIC，用于在 SMP 系统中管理某个特定处理器的所有外部中断。</para> - </listitem> - </itemizedlist> - </listitem> - </itemizedlist></para> + <para><itemizedlist><listitem><para><guilabel>Delay before booting the default image</guilabel>: This lets you +set a delay in seconds before the default operating system is started up.</para></listitem><listitem><para><guilabel>Security</guilabel>: This allows you to set a password for the +bootloader. This means a username and password will be required when booting +to select a booting entry or change settings. The username is <emphasis +role="bold">root</emphasis> and the password is the one chosen here-after.</para></listitem><listitem><para><guilabel>Password</guilabel>: Choose a password for the bootloader.</para></listitem><listitem><para><guilabel>Password (again)</guilabel>: Retype the password and DrakX will +check that it matches with the one above.</para></listitem><listitem><para><guilabel>高级</guilabel></para><itemizedlist><listitem><para><guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power +Interface) is a standard for power management. It can save energy by +stopping unused devices. Deselecting it could be useful if, for example, +your computer does not support ACPI or if you think the ACPI implementation +might cause some problems (for instance random reboots or system lockups).</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>: 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>: Local APIC manages all external +interrupts for a 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> + <para><guilabel>高级</guilabel><itemizedlist><listitem><para><guilabel>Video mode:</guilabel> This sets the screen size and colour depth +to be used by the boot menu. If you click the down triangle you will be +offered other size and colour depth options.</para></listitem><listitem><para><emphasis role="bold">不要修改 ESP 或 MBR</emphasis>：参见<link +linkend="setupChainLoading">使用链式加载</link></para></listitem></itemizedlist></para> </listitem> </itemizedlist> </section> diff --git a/docs/docs/stable/installer/zh_CN/setupBootloaderAddEntry.xml b/docs/docs/stable/installer/zh_CN/setupBootloaderAddEntry.xml index 9195b6f6..4fe16178 100644 --- a/docs/docs/stable/installer/zh_CN/setupBootloaderAddEntry.xml +++ b/docs/docs/stable/installer/zh_CN/setupBootloaderAddEntry.xml @@ -1,15 +1,19 @@ -<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns5="http://www.w3.org/2000/svg" version="5.0" xml:lang="zh_CN" xml:id="setupBootloaderAddEntry"> +<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_CN" xml:id="setupBootloaderAddEntry"> + <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 2016 12 16 Updated for Mageia 6--> <title xml:id="setupBootloaderAddEntry-ti1">添加或修改引导菜单项</title> </info> - <para>为此，您需要手动编辑 /boot/grub2/custom.cfg，或者使用 grub-customizer（可以从 Mageia -仓库中安装）来编辑引导项。</para> + + <para>To do this you need to manually edit /boot/grub2/custom.cfg or use the +software <emphasis role="bold">grub-customizer</emphasis> tool instead +(available in the Mageia repositories).</para> + <note> - <para>有关更多信息，请参考我们的 wiki：<link + <para>For more information, see: <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/docs/stable/installer/zh_CN/setupSCSI.xml b/docs/docs/stable/installer/zh_CN/setupSCSI.xml index 1ce712b5..0005b943 100644 --- a/docs/docs/stable/installer/zh_CN/setupSCSI.xml +++ b/docs/docs/stable/installer/zh_CN/setupSCSI.xml @@ -1,27 +1,23 @@ -<?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="setupSCSI" 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="setupSCSI" version="5.0" xml:lang="zh_CN"> <info> <title xml:id="setupSCSI-ti1">设置SCSI</title> </info> + + + - - - + + + - <mediaobject> + + <mediaobject> <!-- Made by marja on 2012 04 02 --> <!-- NEEDS TO BE REVIEWED! --> <!-- JohnR - edited 2012-03-03 --> @@ -30,13 +26,15 @@ <!-- marja 2012-04-24 added screenshot --> <!-- marja 2012-04-25 replacing John's version 1.6 because that one was based on the Mdv doc instead of on our setupSCSI file --> -<imageobject> <imagedata revision="1" fileref="dx2-setupSCSI.png" -format="PNG" align="center" xml:id="setupSCSI-im1"></imagedata> -</imageobject></mediaobject> +<imageobject> <imagedata format="PNG" fileref="dx2-setupSCSI.png" +align="center" xml:id="setupSCSI-im1" revision="1"/> </imageobject></mediaobject> - <para revision="3.1" xml:id="setupSCSI-pa1">Drakx 通常会正确探测硬盘。对于一些较老的 SCSI 控制器，Drakx 可能无法确定所需的驱动，并因此无法识别它们。</para> + <para revision="3.1" xml:id="setupSCSI-pa1">DrakX will normally detect hard disks correctly. However, with some older +SCSI controllers it may be unable to determine the correct drivers to use +and subsequently fail to recognise the drive.</para> - <para revision="2" xml:id="setupSCSI-pa2">在这种情况下，您需要手动设置 DrakX 应当使用的 SCSI 驱动。</para> + <para revision="2" xml:id="setupSCSI-pa2">If this happens, you will need to manually tell DrakX which SCSI drive(s) +you have.</para> - <para revision="3" xml:id="setupSCSI-pa3">随后 DrakX 应当能正确配置这些驱动器。</para> -</section> + <para xml:id="setupSCSI-pa3" revision="3">随后 DrakX 应当能正确配置这些驱动器。</para> +</section>
\ No newline at end of file diff --git a/docs/docs/stable/installer/zh_CN/soundConfig.xml b/docs/docs/stable/installer/zh_CN/soundConfig.xml index 13a099ff..ff41cfba 100644 --- a/docs/docs/stable/installer/zh_CN/soundConfig.xml +++ b/docs/docs/stable/installer/zh_CN/soundConfig.xml @@ -10,21 +10,28 @@ <imageobject> <imagedata format="PNG" fileref="dx2-soundConfig.png" xml:id="soundConfig-im1" revision="1"/> </imageobject></mediaobject> - <para>这一界面中列出了安装程序为声卡选定的驱动，如果有默认驱动则将其作为默认配置。</para> + <para>In this screen the name of the driver that the installer chose for your +sound card is given, which will be the default driver if one exists.</para> <para>默认驱动通常不会出问题。不过，如果您在安装后遇到问题，请运行 <command>draksound</command>，或通过 MCC（Mageia 控制中心）中<guilabel>硬件</guilabel>选项卡中的<guilabel>声音配置</guilabel>来启动 draksound。</para> - <para>在 draksound -或“声音配置”工具界面，点击<guibutton>高级</guibutton>、<guibutton>故障排除</guibutton>来查看解决问题的建议。</para> + <para>Then, in the <emphasis role="bold">draksound</emphasis> or <emphasis +role="bold">Sound Configuration</emphasis> tool screen, click on +<guibutton>Troubleshooting</guibutton> to find useful advice about how to +solve the problem.</para> <section xml:id="soundConfig-Advanced"> <info> <title xml:id="soundConfig-Advanced-ti1">高级</title> </info> - <para>若没有默认驱动，或者默认驱动选择错误，则可以安装时点击此界面中的<guibutton>Advanced</guibutton>来更正。</para> + <para>Clicking <emphasis role="bold"><guibutton>Advanced</guibutton></emphasis> in +this screen, during install, is useful if there is no default driver and +there are several drivers available, but you think the installer selected +the wrong one.</para> - <para>`在这种情况下，您可以在点击<guibutton>让我选择任意驱动</guibutton>来选择其他驱动程序。</para> + <para>In that case you can select a different driver after clicking on <emphasis +role="bold"><guibutton>Let me pick any driver</guibutton></emphasis>.</para> </section> </section>
\ No newline at end of file diff --git a/docs/docs/stable/installer/zh_CN/takeOverHdConfirm.xml b/docs/docs/stable/installer/zh_CN/takeOverHdConfirm.xml index e8b83cb0..73a062f7 100644 --- a/docs/docs/stable/installer/zh_CN/takeOverHdConfirm.xml +++ b/docs/docs/stable/installer/zh_CN/takeOverHdConfirm.xml @@ -1,5 +1,4 @@ -<?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="takeOverHdConfirm"> - +<?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="takeOverHdConfirm" version="5.0" xml:lang="zh_CN"> <info> <title xml:id="takeOverHdConfirm-ti1">确定要格式化的硬盘</title> </info> @@ -7,7 +6,7 @@ - + @@ -19,13 +18,15 @@ hard disk." with "if you are not sure about your choice", because I'm sure I saw this help screen when I had only one HD --> <!-- 2013-05-05 marja added screenshot --> -<imageobject condition='live'> <imagedata -fileref="live-takeOverHdConfirm.png" format="PNG" align="center" -></imagedata> </imageobject> <imageobject condition='classical'> <imagedata -fileref="dx2-takeOverHdConfirm.png" format="PNG" align="center" -></imagedata> </imageobject></mediaobject> +<imageobject condition="live"> <imagedata format="PNG" +fileref="live-takeOverHdConfirm.png" align="center"/> </imageobject> +<imageobject condition="classical"> <imagedata format="PNG" +fileref="dx2-takeOverHdConfirm.png" align="center"/> </imageobject></mediaobject> - <para revision="1" xml:id="takeOverHdConfirm-pa1">若您不确定选择是否正确，请点击 <guibutton>上一步</guibutton>。</para> + <para xml:id="takeOverHdConfirm-pa1" revision="1">Click on <guibutton>Previous</guibutton> if you are at all unsure about your +choice.</para> - <para revision="1" xml:id="takeOverHdConfirm-pa2">如果您确定要删除所有分区和所有操作系统（及数据），请点击 <guibutton>下一步</guibutton>。</para> -</section> + <para xml:id="takeOverHdConfirm-pa2" revision="1">Click on <guibutton>Next</guibutton> to proceed if you are sure that it is +ok to erase every partition, every operating system and all data that might +be on that hard disk.</para> +</section>
\ No newline at end of file diff --git a/docs/docs/stable/installer/zh_CN/uninstall-Mageia.xml b/docs/docs/stable/installer/zh_CN/uninstall-Mageia.xml index 80618127..2ab99894 100644 --- a/docs/docs/stable/installer/zh_CN/uninstall-Mageia.xml +++ b/docs/docs/stable/installer/zh_CN/uninstall-Mageia.xml @@ -7,21 +7,28 @@ Lebarhon 2016 12 16 this page should be deleted or rewritten.--> - <section> - <title xml:id="uninstall-Mageia-ti2">如何做</title> + <para>If Mageia didn't convince you or you can't install it correctly - in short +you want get rid of it - that is your right and Mageia also gives you the +possibility to uninstall. This is not true for every operating system.</para> - <para>若 Mageia 未能给您提供良好体验，或您未能正确安装系统，Mageia 允许您卸载它。这一功能可不是所有操作系统都会提供的！</para> + <para>After your data backup, reboot your Mageia installation DVD and select +<emphasis role="bold">Rescue system</emphasis>, then, <emphasis +role="bold">Restore Windows boot loader</emphasis>. At the next boot, you +will only have Windows, with no option to choose your operating system.</para> - <para>在备份您的数据后，请用 Mageia 安装 DVD 重新引导系统，并进入救援系统，选择恢复 Windows 引导器（Restore Windows -boot loader）。再次重启后，您将只能进入 Windows 系统。</para> + <para>In Windows to recover the space used by Mageia partitions: click on +<code>Start -> Control Panel -> Administrative Tools -> Computer Management +-> Storage -> Disk Management</code>. You will recognize a Mageia partition +because they are labeled <guilabel>Unknown</guilabel>, and also by their +size and place on the disk. Right click on each of these partitions and +select <guibutton>Delete</guibutton> to free up the space.</para> - <para>若要将被 Mageia 使用的空间重新用于 Windows，请点击 <code>开始 -> 控制面包 -> 管理工具 -> 计算机管理 -> 存储 -> -磁盘管理</code>。拥有 <guilabel>未知</guilabel> 类型的分区即为 Mageia -分区，其大小和位置应当与您安装时指定的一致。右键点击这些分区，并选择 <guibutton>删除</guibutton>，即可释放这些分区占用的空间。</para> + <para>若您安装了 Windows XP，您可以使用空闲空间创建一个新分区并格式化它（FAT32 或 NTFS），系统将自动为其分配一个盘符。</para> - <para>若您安装了 Windows XP，您可以使用空闲空间创建一个新分区并格式化它（FAT32 或 NTFS），系统将自动为其分配一个盘符。</para> - - <para>若您同时安装了 Windows Vista 或 Windows 7，您还可以扩展现存分区的大小。您也可以使用其他分区工具，如 -gparted（Windows 和 Linux 下均由对应版本）。记住：在调整分区时，请多加小心，并确保所有重要的数据均以备份。</para> - </section> + <para>If you have Vista or 7, you have one more possibility, you can extend the +existing partition that is at the left of the freed space. There are other +partitioning tools that can be used, such as <emphasis +role="bold">gparted</emphasis>, available for both Windows and Linux. As +always, when changing partitions, be very careful to back up anything +important to you.</para> </section>
\ No newline at end of file |