aboutsummaryrefslogtreecommitdiffstats
path: root/docs/installer
diff options
context:
space:
mode:
authorYuri Chornoivan <yurchor@ukr.net>2017-03-20 19:04:29 +0200
committerYuri Chornoivan <yurchor@ukr.net>2017-03-20 19:04:29 +0200
commitf3a4ebee912a3ff0c60c436ebf2d7a52a273c187 (patch)
tree86a8ac7ef9a24a68cdcc1e46becc9df3e80b19ef /docs/installer
parent7622f49ec4e8167c9288756775c41cb6189666aa (diff)
downloadtools-f3a4ebee912a3ff0c60c436ebf2d7a52a273c187.tar
tools-f3a4ebee912a3ff0c60c436ebf2d7a52a273c187.tar.gz
tools-f3a4ebee912a3ff0c60c436ebf2d7a52a273c187.tar.bz2
tools-f3a4ebee912a3ff0c60c436ebf2d7a52a273c187.tar.xz
tools-f3a4ebee912a3ff0c60c436ebf2d7a52a273c187.zip
Update Chinese (Simplified) translation
Diffstat (limited to 'docs/installer')
-rw-r--r--docs/installer/zh_CN.po325
-rw-r--r--docs/installer/zh_CN/SelectAndUseISOs2.xml101
-rw-r--r--docs/installer/zh_CN/addUser.xml25
-rw-r--r--docs/installer/zh_CN/diskdrake.xml12
-rw-r--r--docs/installer/zh_CN/doPartitionDisks.xml30
-rw-r--r--docs/installer/zh_CN/reboot.xml10
-rw-r--r--docs/installer/zh_CN/setupBootloader.xml54
7 files changed, 156 insertions, 401 deletions
diff --git a/docs/installer/zh_CN.po b/docs/installer/zh_CN.po
index 49a781ec..9a7ee066 100644
--- a/docs/installer/zh_CN.po
+++ b/docs/installer/zh_CN.po
@@ -1,24 +1,30 @@
+# SOME DESCRIPTIVE TITLE
# Copyright (C) YEAR Mageia
# This file is distributed under the same license as the Mageia Installer Help package.
#
# Translators:
-# 吴善俊 <sjwuny@126.com>, 2013.
-# Xiaobo Zhou <zhouxiaobo.500@gmail.com>, 2014.
-# xiao wenming <xwm-citcc5@hotmail.com>, 2015.
-# zwpwjwtz <zwpwjwtz@126.com>, 2016-2017.
+# 吴善俊 <sjwuny@126.com>, 2013
+# Xiaobo Zhou <zhouxiaobo.500@gmail.com>, 2014
+# Xiaobo Zhou <zhouxiaobo.500@gmail.com>, 2014
+# xiao wenming <xwm-citcc5@hotmail.com>, 2015
+# Yuri Chornoivan <yurchor@ukr.net>, 2016
+# zwpwjwtz <zwpwjwtz@126.com>, 2016-2017
+# 吴善俊 <sjwuny@126.com>, 2013
+# Xiaobo Zhou <zhouxiaobo.500@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
"POT-Creation-Date: 2017-03-14 20:10+0200\n"
-"PO-Revision-Date: 2017-03-14 21:42+0200\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"PO-Revision-Date: 2017-03-20 12:46+0000\n"
+"Last-Translator: zwpwjwtz <zwpwjwtz@126.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/"
+"language/zh_CN/)\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Lokalize 1.5\n"
#. type: Content of: <section><info><title>
#: en/acceptLicense.xml:25
@@ -107,9 +113,9 @@ msgstr "zh_CN"
msgid "Media Selection (Configure Supplemental Installation Media)"
msgstr "介质选择 (设置增补的安装介质)"
-#. papoteur 2013-04-13 - created
-#. marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection
-#. marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell
+#. 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
#. type: Content of: <section><mediaobject>
#: en/add_supplemental_media.xml:18
msgid ""
@@ -283,7 +289,8 @@ msgstr ""
msgid ""
"Any user you add while installing Mageia, will have a both read and write "
"protected home directory (umask=0027)."
-msgstr "在安装 Mageia 期间添加的任何用户都将拥有读/写保护的主目录（即 umask=0027）。"
+msgstr ""
+"在安装 Mageia 期间添加的任何用户都将拥有读/写保护的主目录（即 umask=0027）。"
#. type: Content of: <section><section><note><para>
#: en/addUser.xml:63
@@ -374,17 +381,17 @@ msgstr ""
msgid "Choose the mount points"
msgstr "选择挂载点"
-#. Made by marja on 2012 03 28
-#. NEEDS TO BE REVIEWED!
-#. SimonNZG 2012-04-03 has taken a look but needs to come back
-#. removed para xml:id's, marja, 20120409
+#. Made by marja on 2012 03 28
+#. NEEDS TO BE REVIEWED!
+#. SimonNZG 2012-04-03 has taken a look but needs to come back
+#. removed para xml:id's, marja, 20120409
#. barjac 14/04/2012 Minor edit to improve grammar and replaced "at least ONE"
-#. with "a", as I can't imagine having more than one root partition ;)
-#. Lebarhon : I put [] where it seems having mistakes
+#. with "a", as I can't imagine having more than one root partition ;)
+#. Lebarhon : I put [] where it seems having mistakes
#. Marja: you're right, in English English it is "its type", however, the Americans
#. 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
+#. And JohnR says the Americans are WRONG! :-))
+#. 2012-04-19 Language proofreading done
#. type: Content of: <section><mediaobject>
#: en/ask_mntpoint_s.xml:27
msgid ""
@@ -417,7 +424,8 @@ msgstr ""
msgid ""
"If you change anything, make sure you still have a <literal>/</literal> "
"(root) partition."
-msgstr "如果进行了更改，请确保你仍然具有访问 <literal>/</literal> （根）分区的权限。"
+msgstr ""
+"如果进行了更改，请确保你仍然具有访问 <literal>/</literal> （根）分区的权限。"
#. type: Content of: <section><itemizedlist><listitem><para>
#: en/ask_mntpoint_s.xml:48
@@ -847,8 +855,8 @@ msgstr ""
msgid "Configure your Services"
msgstr "配置服务"
-#. 2012-12-25 marja - moved this section out of misc-params.xml
-#. 2013-05-05 marja - added screenshot
+#. 2012-12-25 marja - moved this section out of misc-params.xml
+#. 2013-05-05 marja - added screenshot
#. type: Content of: <section><mediaobject>
#: en/configureServices.xml:21
msgid ""
@@ -895,8 +903,8 @@ msgstr "只有在您完全了解您的行为的风险后再作出改动。"
msgid "Configure your Timezone"
msgstr "配置时区"
-#. 2012-12-25 marja - moved this part out of misc-params.xml
-#. 2013-05-05 marja - added screenshot
+#. 2012-12-25 marja - moved this part out of misc-params.xml
+#. 2013-05-05 marja - added screenshot
#. type: Content of: <section><mediaobject>
#: en/configureTimezoneUTC.xml:11
msgid ""
@@ -931,7 +939,8 @@ msgstr "在下一个窗口中，您可以将硬件时钟设置为本地时间或
msgid ""
"If you have more than one operating system on your computer, make sure they "
"are all set to local time, or all to UTC/GMT."
-msgstr "若您安装了多个操作系统，请确保硬件时钟均被设为本地时间，或均为 UTC/GMT。"
+msgstr ""
+"若您安装了多个操作系统，请确保硬件时钟均被设为本地时间，或均为 UTC/GMT。"
#. type: Content of: <section><info><title>
#: en/configureX_card_list.xml:11
@@ -1003,7 +1012,8 @@ msgstr ""
msgid ""
"Be aware that if you select an incompatible driver you may only have access "
"to the Commandline Interface."
-msgstr "请注意，若选择了不兼容的驱动，您可能无法使用图形化界面（但仍可使用命令行）。"
+msgstr ""
+"请注意，若选择了不兼容的驱动，您可能无法使用图形化界面（但仍可使用命令行）。"
#. type: Content of: <section><para>
#: en/configureX_card_list.xml:51
@@ -1800,10 +1810,10 @@ msgstr "若您有任何疑问，或希望帮助完善 Mageia，请访问 www.mag
msgid "Formatting"
msgstr "格式化"
-#. 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
+#. 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
#. type: Content of: <section><mediaobject>
#: en/formatPartitions.xml:18
msgid ""
@@ -1932,7 +1942,8 @@ msgstr "在此页中，可以进行自定义设置："
msgid ""
"The language (for the installation only, may be different that the chosen "
"language for the system) by pressing the key F2 (Legacy mode only)"
-msgstr "按 F2 选择语言（仅用于安装，可能与系统所选语言有出入）（仅用于传统模式）。"
+msgstr ""
+"按 F2 选择语言（仅用于安装，可能与系统所选语言有出入）（仅用于传统模式）。"
#. type: Content of: <section><itemizedlist><listitem><mediaobject>
#: en/installer.xml:66
@@ -2180,7 +2191,8 @@ msgstr ""
msgid ""
"Most screens have <guibutton>Help</guibutton> buttons which give further "
"explanations about the current step."
-msgstr "多数窗口中有<guibutton>帮助</guibutton>按钮，可以提供当前操作的有关说明。"
+msgstr ""
+"多数窗口中有<guibutton>帮助</guibutton>按钮，可以提供当前操作的有关说明。"
#. type: Content of: <section><section><note><para>
#: en/installer.xml:214
@@ -2291,10 +2303,10 @@ msgstr ""
msgid "Updates"
msgstr "更新"
-#. Made by marja on 2012 03 30
-#. NEEDS TO BE REVIEWED!
+#. 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
+#. marja, 2012-04-24 added screenshot
#. type: Content of: <section><mediaobject>
#: en/installUpdates.xml:13
msgid ""
@@ -2378,9 +2390,9 @@ msgstr ""
msgid "Media Selection (Nonfree)"
msgstr "介质选择 (Nonfree)"
-#. papoteur 2013-04-11 - created
+#. 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-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)
#. type: Content of: <section><mediaobject>
#: en/media_selection.xml:12
@@ -2637,7 +2649,8 @@ msgstr "<guilabel>服务</guilabel>:"
msgid ""
"System services refer to those small programs which run the background "
"(daemons). This tool allows you to enable or disable certain tasks."
-msgstr "系统服务指在后台运行的小程序（守护进程）。此工具允许您启用或禁用特定任务。"
+msgstr ""
+"系统服务指在后台运行的小程序（守护进程）。此工具允许您启用或禁用特定任务。"
#. type: Content of: <section><section><itemizedlist><listitem><para>
#: en/misc-params.xml:89
@@ -2893,8 +2906,8 @@ msgstr ""
msgid "Security Level"
msgstr "安全级别"
-#. 2012-12-25 marja - moved this part out of misc-params.xml"
-#. 2013-05-05 marja - added screenshot
+#. 2012-12-25 marja - moved this part out of misc-params.xml"
+#. 2013-05-05 marja - added screenshot
#. type: Content of: <section><mediaobject>
#: en/securityLevel.xml:19
msgid ""
@@ -2990,7 +3003,8 @@ msgid ""
"Here, a medium (plural: media) is an ISO image file that allows you to "
"install and/or update Mageia and by extension any physical support the ISO "
"file is copied to."
-msgstr "媒介：是一类承载 ISO 文件、可以用于安装和/或更新 Mageia 的任意物理介质。"
+msgstr ""
+"媒介：是一类承载 ISO 文件、可以用于安装和/或更新 Mageia 的任意物理介质。"
#. type: Content of: <section><section><section><para>
#: en/SelectAndUseISOs2.xml:37
@@ -3063,7 +3077,8 @@ msgstr "Live 媒介"
msgid ""
"Can be used to preview the distribution without installing it on a HDD, and "
"optionally install Mageia on to your HDD."
-msgstr "可以用于预览该发行版，而无需将其安装到硬盘上。也可以用于安装 Mageia 至硬盘。"
+msgstr ""
+"可以用于预览该发行版，而无需将其安装到硬盘上。也可以用于安装 Mageia 至硬盘。"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:85
@@ -3231,7 +3246,6 @@ msgstr "检查下载文件的完整性"
#. type: Content of: <section><section><section><para>
#: en/SelectAndUseISOs2.xml:218
-#, fuzzy
msgid ""
"Both checksums are hexadecimal numbers calculated by an algorithm from the "
"file to be downloaded. When you ask these algorithms to recalculate this "
@@ -3240,9 +3254,10 @@ msgid ""
"failure. A failure infers that you should retry the download or attempt a "
"repair using BitTorrent."
msgstr ""
-"这两种校验和均由特定算法计算文件内容产生，且均为十六进制数字。若您重新计算得"
-"到的校验和与 Mageia 提供的校验和一致，说明您下载的文件内容正确；否则，说明您"
-"下载失败（文件可能不完整或已损坏），您应当重新下载。"
+"这两种校验和均由特定算法计算文件内容产生，且均为十六进制数字。当您使用这些算"
+"法来重新计算下载文件的校验值时，如果您得到的结果和 Mageia 提供的一致，说明您"
+"的文件没有问题；否则，说明下载失败，您可能需要重新下载，或改用 BitTorrent 下"
+"载。"
#. type: Content of: <section><section><section><para>
#: en/SelectAndUseISOs2.xml:219
@@ -3272,7 +3287,8 @@ msgstr ""
msgid ""
"and compare the obtained number on your computer (you may have to wait for a "
"while) with the number given by Mageia. Example:"
-msgstr "然后比较执行结果（可能需要等待一段时间）和 Mageia 网上提供的数值。例如："
+msgstr ""
+"然后比较执行结果（可能需要等待一段时间）和 Mageia 网上提供的数值。例如："
#. type: Content of: <section><section><section><mediaobject>
#: en/SelectAndUseISOs2.xml:227
@@ -3413,7 +3429,8 @@ msgstr "打开一个终端"
msgid ""
"Become root with the command <userinput>su -</userinput> (don't forget the "
"final '-' )"
-msgstr "使用命令 <userinput>su -</userinput> 获取 root 权限（不要漏掉末尾的“-”）"
+msgstr ""
+"使用命令 <userinput>su -</userinput> 获取 root 权限（不要漏掉末尾的“-”）"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
#: en/SelectAndUseISOs2.xml:280
@@ -3453,21 +3470,16 @@ msgstr ""
msgid ""
"[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
"[72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000\n"
-"[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, "
-"SerialNumber=3\n"
+"[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3\n"
"[72594.770536] usb 1-1: Product: Mass Storage Device\n"
"[72594.770537] usb 1-1: Manufacturer: JetFlash\n"
"[72594.770539] usb 1-1: SerialNumber: 18MJTWLMPUCC3SSB\n"
-"[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep "
-"desc says 255 microframes\n"
-"[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep "
-"desc says 255 microframes\n"
+"[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep desc says 255 microframes\n"
+"[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep desc says 255 microframes\n"
"[72594.771122] usb-storage 1-1:1.0: USB Mass Storage device detected\n"
"[72594.772447] scsi host8: usb-storage 1-1:1.0\n"
-"[72595.963238] scsi 8:0:0:0: Direct-Access JetFlash Transcend 2GB 1100 "
-"PQ: 0 ANSI: 4\n"
-"[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 "
-"GB/2.00 GiB)\n"
+"[72595.963238] scsi 8:0:0:0: Direct-Access JetFlash Transcend 2GB 1100 PQ: 0 ANSI: 4\n"
+"[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 GB/2.00 GiB)\n"
"[72595.964104] sd 8:0:0:0: [sdd] Write Protect is off\n"
"[72595.964108] sd 8:0:0:0: [sdd] Mode Sense: 43 00 00 00\n"
"[72595.965025] sd 8:0:0:0: [sdd] No Caching mode page found\n"
@@ -3477,21 +3489,16 @@ msgid ""
msgstr ""
"[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
"[72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000\n"
-"[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, "
-"SerialNumber=3\n"
+"[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3\n"
"[72594.770536] usb 1-1: Product: Mass Storage Device\n"
"[72594.770537] usb 1-1: Manufacturer: JetFlash\n"
"[72594.770539] usb 1-1: SerialNumber: 18MJTWLMPUCC3SSB\n"
-"[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep "
-"desc says 255 microframes\n"
-"[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep "
-"desc says 255 microframes\n"
+"[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep desc says 255 microframes\n"
+"[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep desc says 255 microframes\n"
"[72594.771122] usb-storage 1-1:1.0: USB Mass Storage device detected\n"
"[72594.772447] scsi host8: usb-storage 1-1:1.0\n"
-"[72595.963238] scsi 8:0:0:0: Direct-Access JetFlash Transcend 2GB 1100 "
-"PQ: 0 ANSI: 4\n"
-"[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 "
-"GB/2.00 GiB)\n"
+"[72595.963238] scsi 8:0:0:0: Direct-Access JetFlash Transcend 2GB 1100 PQ: 0 ANSI: 4\n"
+"[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 GB/2.00 GiB)\n"
"[72595.964104] sd 8:0:0:0: [sdd] Write Protect is off\n"
"[72595.964108] sd 8:0:0:0: [sdd] Mode Sense: 43 00 00 00\n"
"[72595.965025] sd 8:0:0:0: [sdd] No Caching mode page found\n"
@@ -3513,7 +3520,8 @@ msgstr ""
msgid ""
"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
"bs=1M</userinput>"
-msgstr "输入命令：# <userinput>dd if=ISO文件的完整路径 of=/dev/sdX bs=1M</userinput>"
+msgstr ""
+"输入命令：# <userinput>dd if=ISO文件的完整路径 of=/dev/sdX bs=1M</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:326
@@ -3867,17 +3875,18 @@ msgstr ""
msgid ""
"You can change the language of your system after installation in the Mageia "
"Control Center -> System -> Manage localization for your system."
-msgstr "您可以在安装完成后，在 Mageia 控制中心 -> 系统 -> 管理本地化 中改变系统语言。"
+msgstr ""
+"您可以在安装完成后，在 Mageia 控制中心 -> 系统 -> 管理本地化 中改变系统语言。"
#. type: Content of: <section><info><title>
#: en/selectMouse.xml:4
msgid "Select mouse"
msgstr "选择鼠标"
-#. Made by marja on 2012 04 11
-#. NEEDS TO BE REVIEWED!
+#. Made by marja on 2012 04 11
+#. NEEDS TO BE REVIEWED!
#. adding some "real" text now that we know the page shows up in the right place
-#. marja 2012-04-24 adding screenshot
+#. marja 2012-04-24 adding screenshot
#. type: Content of: <section><mediaobject>
#: en/selectMouse.xml:16
msgid ""
@@ -4001,7 +4010,8 @@ msgstr "GRUB2-efi，当使用 UEFI 硬件时"
msgid ""
"With an UEFI system, the user interface is slightly different as you cannot "
"choose between with or without graphical menu"
-msgstr "对于 UEFI，用户界面会稍有不同，您将无法选择引导器（因为只能使用 Grub2-efi）。"
+msgstr ""
+"对于 UEFI，用户界面会稍有不同，您将无法选择引导器（因为只能使用 Grub2-efi）。"
#. type: Content of: <section><section><section><mediaobject>
#: en/setupBootloader.xml:56
@@ -4132,7 +4142,8 @@ msgstr ""
msgid ""
"You will get a warning that the bootloader is missing, ignore it by clicking "
"<guibutton>OK</guibutton>."
-msgstr "安装程序将会提醒您缺少引导器，请忽略它并点击<guibutton>确定</guibutton>。"
+msgstr ""
+"安装程序将会提醒您缺少引导器，请忽略它并点击<guibutton>确定</guibutton>。"
#. type: Content of: <section><section><mediaobject>
#: en/setupBootloader.xml:142
@@ -4204,6 +4215,9 @@ msgid ""
"you think the ACPI implementation might cause some problems (for instance "
"random reboots or system lockups)."
msgstr ""
+"ACPI（高级配置与电源接口）是标准的电源管理协议。它可以关闭未使用的设备以节"
+"能，用于取代 APM。如果您的硬件不兼容 ACPI，或者您认为 ACPI 会造成某些问题（如"
+"偶尔会自动重启，或系统卡死），则可以取消勾选它。"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
#: en/setupBootloader.xml:193
@@ -4211,6 +4225,8 @@ msgid ""
"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
"multiprocessing for multi core processors."
msgstr ""
+"<guilabel>启用 SMP</guilabel>：此选项启用或禁用多核处理器上的对称多处理器特"
+"性。"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
#: en/setupBootloader.xml:199
@@ -4220,6 +4236,8 @@ msgid ""
"APIC devices permit more complex priority models, and Advanced IRQ "
"(Interrupt Request) management."
msgstr ""
+"<guilabel>启用 APIC</guilabel>：启用或禁用高级可编程中断控制器。APIC 设备可以"
+"支持更复杂的优先级模型和高级 IRQ（中断请求）管理功能。"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
#: en/setupBootloader.xml:207
@@ -4227,6 +4245,8 @@ msgid ""
"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
"manages all external interrupts for a specific processor in an SMP system."
msgstr ""
+"<guilabel>启用本地 APIC</guilabel>：您可以在这里设置本地 APIC，用于在 SMP 系"
+"统中管理某个特定处理器的所有外部中断。"
#. type: Content of: <section><section><section><title>
#: en/setupBootloader.xml:217
@@ -4243,7 +4263,8 @@ msgstr "<guilabel>默认</guilabel>：使用默认引导参数"
msgid ""
"<guilabel>Append:</guilabel> This option lets you pass the kernel "
"information or tell the kernel to give you more information as it boots."
-msgstr "<guilabel>追加</guilabel> ：用于在默认引导选项后添加额外所需的内核参数。"
+msgstr ""
+"<guilabel>追加</guilabel> ：用于在默认引导选项后添加额外所需的内核参数。"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
#: en/setupBootloader.xml:232
@@ -4278,14 +4299,14 @@ msgstr ""
msgid "Setup SCSI"
msgstr "设置SCSI"
-#. Made by marja on 2012 04 02
-#. NEEDS TO BE REVIEWED!
-#. JohnR - edited 2012-03-03
-#. SimonNZG has reviewed 2012-04-03 (changed editted to edited in JohnR's comment ;-)
-#. barjac has re-reviewed and made some minor tweaks. Revisions incremented.
-#. marja 2012-04-24 added screenshot
+#. Made by marja on 2012 04 02
+#. NEEDS TO BE REVIEWED!
+#. JohnR - edited 2012-03-03
+#. SimonNZG has reviewed 2012-04-03 (changed editted to edited in JohnR's comment ;-)
+#. barjac has re-reviewed and made some minor tweaks. Revisions incremented.
+#. 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
+#. Mdv doc instead of on our setupSCSI file
#. type: Content of: <section><mediaobject>
#: en/setupSCSI.xml:26
msgid ""
@@ -4338,7 +4359,8 @@ msgid ""
"In this screen the name of the driver that the installer chose for your "
"sound card is given, which will be the default driver if we have a default "
"one."
-msgstr "这一界面中列出了安装程序为声卡选定的驱动，如果有默认驱动则将其作为默认配置。"
+msgstr ""
+"这一界面中列出了安装程序为声卡选定的驱动，如果有默认驱动则将其作为默认配置。"
#. type: Content of: <section><para>
#: en/soundConfig.xml:18
@@ -4392,12 +4414,12 @@ msgstr ""
msgid "Confirm hard disk to be formatted"
msgstr "确定要格式化的硬盘"
-#. Made by marja on 2012 04 03
-#. test comment - johnr
+#. Made by marja on 2012 04 03
+#. test comment - johnr
#. 2012-04-24 marja - replaced "if you are not sure you selected the correct
#. 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
+#. saw this help screen when I had only one HD
+#. 2013-05-05 marja added screenshot
#. type: Content of: <section><mediaobject>
#: en/takeOverHdConfirm.xml:19
msgid ""
@@ -4649,130 +4671,3 @@ msgid ""
msgstr ""
"下一步是复制文件到硬盘。这需要花费几分钟的时间。之后，您的屏幕会变黑一段时"
"间，这是正常现象。"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
-
-#~ msgid ""
-#~ "<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type="
-#~ "\"mediaobject\" id=\"1\"/>"
-#~ msgstr ""
-#~ "<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type="
-#~ "\"mediaobject\" id=\"1\"/>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
-#~ "imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png"
-#~ "\"/> </imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
-#~ "imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png"
-#~ "\"/> </imageobject>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
-#~ "\"center\"/> </imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
-#~ "\"center\"/> </imageobject>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
-#~ "imageobject>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-#~ "imageobject>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
-#~ "imageobject>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
-#~ "imageobject>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-#~ "imageobject>"
-
-#~ msgid "Different media for architecture 32 or 64 bits."
-#~ msgstr "媒介有 32 位和 64 位两种架构之分。"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </"
-#~ "imageobject>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
-#~ "setupBootloader.png\"/> </imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
-#~ "setupBootloader.png\"/> </imageobject>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-#~ "imageobject>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
-#~ "imageobject>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
-#~ "imageobject>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
-#~ "imageobject>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
-#~ "imageobject>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
-#~ "imageobject>"
diff --git a/docs/installer/zh_CN/SelectAndUseISOs2.xml b/docs/installer/zh_CN/SelectAndUseISOs2.xml
index 84fd3b6b..243e98ed 100644
--- a/docs/installer/zh_CN/SelectAndUseISOs2.xml
+++ b/docs/installer/zh_CN/SelectAndUseISOs2.xml
@@ -1,207 +1,158 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_CN" xml:id="Select-and-use-ISOs">
+<?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="Select-and-use-ISOs">
-
<info>
<!-- Made by Lebarhon 2014 03 26
Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about 1.3.2-->
<title xml:id="Select-and-use-ISOs-ti1">选择和使用 ISO</title>
</info>
-
<section>
<title>简介</title>
-
<para>Mageia 通过 ISO 镜像进行分发。此页将帮助您选择所需的镜像。</para>
-
<para>有两种类型的媒介：</para>
-
<itemizedlist>
<listitem>
<para>传统安装器：在引导之后，程序将提供一系列用于安装和配置目标系统的选项。这种安装类型可以给予您最大限度的灵活性，尤其是选择所需安装的桌面环境。</para>
</listitem>
-
<listitem>
<para>Live 媒介：您无需实际安装即可实际体验 Mageia 系统，以便确定系统被安装之后的模样。这种安装的过程更加简单，但您可做的选择也相应减少。</para>
</listitem>
</itemizedlist>
-
<para>下一节中将涉及有关细节。</para>
</section>
-
<section>
<title>介质</title>
-
<section>
<title>定义</title>
-
<para>媒介：是一类承载 ISO 文件、可以用于安装和/或更新 Mageia 的任意物理介质。</para>
-
<para>您可以在<link ns4:href="http://www.mageia.org/en/downloads/">这里</link>找到它们。</para>
</section>
-
<section>
<title>传统安装媒介</title>
-
<section>
<title>通用特性</title>
-
<itemizedlist>
<listitem>
<para>这些 ISO 使用传统的安装器（drakx）。</para>
</listitem>
-
<listitem>
<para>它们可以用于全新安装，或更新之前的版本。</para>
</listitem>
</itemizedlist>
</section>
-
<section>
<title>DVD</title>
-
<itemizedlist>
<listitem>
<para>媒介有 32 位和 64 位两种架构之分。</para>
</listitem>
-
<listitem>
<para>欢迎屏幕中列出了一些可用的工具，如：救援系统、内存测试、硬件检测工具。</para>
</listitem>
-
<listitem>
<para>每个 DVD 中包含多种桌面环境和语言支持。</para>
</listitem>
-
<listitem>
<para>您可以在安装时添加非自由软件。</para>
</listitem>
</itemizedlist>
</section>
</section>
-
<section>
<title>Live 媒介</title>
-
<section>
<title>通用特性</title>
-
<itemizedlist>
<listitem>
<para>可以用于预览该发行版，而无需将其安装到硬盘上。也可以用于安装 Mageia 至硬盘。</para>
</listitem>
-
<listitem>
<para>每个 ISO 仅包含一种桌面环境（KDE、GNOME 或 Xfce）。</para>
</listitem>
-
<listitem>
<para>媒介有 32 位和 64 位两种架构之分。</para>
</listitem>
-
<listitem>
<para><emphasis role="bold">Live ISO 仅能用于全新安装，而无法对之前的版本进行升级。</emphasis></para>
</listitem>
-
<listitem>
<para>其中包含非自由软件。</para>
</listitem>
</itemizedlist>
</section>
-
<section>
<title>Live DVD KDE</title>
-
<itemizedlist>
<listitem>
<para>仅包含 KDE（Plasma）桌面环境。</para>
</listitem>
-
<listitem>
<para>包含所有语言支持。</para>
</listitem>
-
<listitem>
<para>媒介有 32 位和 64 位两种架构之分。</para>
</listitem>
</itemizedlist>
</section>
-
<section>
<title>Live DVD GNOME</title>
-
<itemizedlist>
<listitem>
<para>仅包含 GNOME 桌面环境。</para>
</listitem>
-
<listitem>
<para>包含所有语言支持。</para>
</listitem>
-
<listitem>
<para>媒介有 32 位和 64 位两种架构之分。</para>
</listitem>
</itemizedlist>
</section>
-
<section>
<title>Live DVD Xfce</title>
-
<itemizedlist>
<listitem>
<para>仅包含 Xfce 桌面环境。</para>
</listitem>
-
<listitem>
<para>包含所有语言支持。</para>
</listitem>
-
<listitem>
<para>媒介有 32 位和 64 位两种架构之分。</para>
</listitem>
</itemizedlist>
</section>
</section>
-
<section>
<title>仅用于引导的 CD</title>
-
<section>
<title>通用特性</title>
-
<itemizedlist>
<listitem>
<para>此类媒介仅包含启动 drakx 安装器和查找 drakx-installer-stage2
等软件包所必须的程序，因此非常轻巧。用于后续安装的软件包可以位于电脑硬盘、本地驱动器、本地网络或互联网。</para>
</listitem>
-
<listitem>
<para>这类媒介非常小巧（小于 100 MB），适用于不方便下载完整版 DVD、没有 DVD 驱动器或不支持 USB 引导的电脑。</para>
</listitem>
-
<listitem>
<para>媒介有 32 位和 64 位两种架构之分。</para>
</listitem>
-
<listitem>
<para>仅包含英语支持。</para>
</listitem>
</itemizedlist>
</section>
-
<section>
<title>netinstall.iso</title>
-
<itemizedlist>
<listitem>
<para>仅包含自由软件，适用于不希望使用非自由软件的人。</para>
</listitem>
</itemizedlist>
</section>
-
<section>
<title>netinstall-nonfree.iso</title>
-
<itemizedlist>
<listitem>
<para>包含部分用户所需的非自由软件（主要为驱动、编码器）。</para>
@@ -210,130 +161,90 @@ Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about
</section>
</section>
</section>
-
<section>
<title>下载和检查媒介</title>
-
<section>
<title>下载中</title>
-
<para>在选择了 ISO 文件后，您可以通过 HTTP 或 BitTorrent
下载它。相应的窗口中将会提示您正在使用的镜像源，并在速度太慢时提醒您更换镜像源。若您使用 HTTP 方式下载，您可能会看到类似下列情形</para>
-
<mediaobject>
<imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
-
<para>md5sum 和 sha1sum 是用于检查 ISO 文件完整性的工具，只需使用其中一种即可。请您保留它们以便<link
linkend="integrity">后续使用</link>。之后，窗口将会显示：</para>
-
<mediaobject>
<imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
-
<para>点击“保存文件”选项。</para>
</section>
-
<section>
<title xml:id="integrity">检查下载文件的完整性</title>
-
- <para>这两种校验和均由特定算法计算文件内容产生，且均为十六进制数字。若您重新计算得到的校验和与 Mageia
-提供的校验和一致，说明您下载的文件内容正确；否则，说明您下载失败（文件可能不完整或已损坏），您应当重新下载。</para>
-
+ <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>
-
<mediaobject>
<imageobject> <imagedata fileref="../Md5sum.png"/> </imageobject></mediaobject>
-
<para/>
</section>
</section>
-
<section>
<title>刻录或转储 ISO</title>
-
<para>经过检查后的 ISO 即可被刻录至 CD/DVD，或写入到 U 盘。这些操作不同于简单的复制，其目的是创建一个可引导的媒体。</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>
</section>
-
<section>
<title>写入 ISO 到 U 盘</title>
-
<para>所有的 Mageia ISO 均为混合类型 ISO，因此您可以将其“转储”到 U 盘中，然后使用 U 盘来引导和安装系统。</para>
-
<warning>
<para>“转储”镜像至闪存设备将会破坏设备上原先的文件系统，任何数据都将丢失，并且分区容量将会（暂时）缩减为镜像大小。</para>
</warning>
-
<para>若要恢复原始容量，您必须重新进行分区和格式化操作。</para>
-
<section>
<title>使用 Mageia 的图形化工具</title>
-
<para>您可以使用 <link
ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks">IsoDumper</link>
这样的图形化工具来操作。</para>
</section>
-
<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>
</section>
-
<section>
<title>使用 GNU/Linux 系统中的命令行程序</title>
-
<warning>
<para>手动进行此操作有潜在 *危险*。如果您弄错了设备 ID，可能会覆盖掉其他分区中的数据。</para>
</warning>
-
<para>您也可以在终端中使用 dd 工具：</para>
-
<orderedlist>
<listitem>
<para>打开一个终端</para>
</listitem>
-
<listitem>
<para>使用命令 <userinput>su -</userinput> 获取 root 权限（不要漏掉末尾的“-”）</para>
-
<mediaobject>
<imageobject> <imagedata fileref="../Root.png"/> </imageobject></mediaobject>
</listitem>
-
<listitem>
<para>插入您的 U 盘（无需挂载，并且不要用任何应用程序或文件管理器访问它）</para>
</listitem>
-
<listitem>
<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
[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
@@ -353,24 +264,18 @@ Disk Imager</link></para>
[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>
</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-4-x86_64-DVD.iso
of=/dev/sdb bs=1M</userinput></para>
</listitem>
-
<listitem>
<para>输入命令：# <userinput>sync</userinput></para>
</listitem>
-
<listitem>
<para>操作完成，拔下 U 盘</para>
</listitem>
diff --git a/docs/installer/zh_CN/addUser.xml b/docs/installer/zh_CN/addUser.xml
index 034c2203..57488e6e 100644
--- a/docs/installer/zh_CN/addUser.xml
+++ b/docs/installer/zh_CN/addUser.xml
@@ -1,98 +1,75 @@
-<?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">
+<?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">
<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>
-
<note xml:id="givePassword">
<para>所有的密码都区分大小写。建议在密码中混合使用字母（大写和小写）、数字和其他字符。</para>
</note>
</section>
-
<section xml:id="enterUser">
<info>
<title xml:id="enterUser-ti3">输入用户名</title>
</info>
-
<para>在这里添加一个用户。一个用户拥有比超级管理员更少的权限，但是网上冲浪，使用办公软件或者玩游戏等是足够的。</para>
-
<itemizedlist>
<listitem>
<para><guibutton>图标</guibutton>：若点击此按钮，则会改变用户图标。</para>
</listitem>
-
<listitem>
<para><guilabel>真实姓名</guilabel>：在文本框中输入用户的真名。</para>
</listitem>
-
<listitem>
<para><guilabel>登录名</guilabel>：输入用户的登录名，或让 drakx
根据真实姓名自动设置。<emphasis>登录名区分大小写。</emphasis></para>
</listitem>
-
<listitem>
<para><guilabel>密码</guilabel>：在此文本框中输入用户密码。后面的盾牌图标将会指示密码强度。（参见 <xref
linkend="givePassword"/>）</para>
</listitem>
-
<listitem>
<para><guilabel>密码（重复）</guilabel>：再输入依次用户密码。drakx 将会检查两次输入的密码是否一致。</para>
</listitem>
</itemizedlist>
-
<note>
<para>在安装 Mageia 期间添加的任何用户都将拥有读/写保护的主目录（即 umask=0027）。</para>
-
<para>你可以在<emphasis>配置 - 概要</emphasis>一步中添加其他所需用户，只需选择<emphasis>用户管理</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>
-
<itemizedlist>
<listitem condition="classical">
<para><guilabel>启用来宾账户</guilabel>：这里您可以启用或禁用来宾账户。来宾账户允许来宾登录并使用电脑，但对其使用更严格的访问权限控制。</para>
</listitem>
-
<listitem>
<para><guilabel>Shell</guilabel>：可以在下列列表中选择用户所使用的 shell（在上一步中添加），可能的选项有 Bash、Dash
和 Sh。</para>
</listitem>
-
<listitem>
<para><guilabel>用户 ID</guilabel>：这里您可以设置之前所添加的用户的 ID（数值）。若您不确定如何设置，请将其留空。</para>
</listitem>
-
<listitem>
<para><guilabel>组 ID</guilabel>：这里您可以设置之前所添加的用户的 组 ID（数值，一般与用户 ID
相同）。若您不确定如何设置，请将其留空。</para>
diff --git a/docs/installer/zh_CN/diskdrake.xml b/docs/installer/zh_CN/diskdrake.xml
index 2e37d570..10d16591 100644
--- a/docs/installer/zh_CN/diskdrake.xml
+++ b/docs/installer/zh_CN/diskdrake.xml
@@ -33,16 +33,18 @@ fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject>
<para>若您需要在 UEFI 硬件上使用 Mageia，请确保您设置了 ESP（EFI 系统分区），并且已被挂载至 /boot/EFI（见下）</para>
<para><mediaobject>
-<imageobject> <imagedata fileref="dx2-diskdrake2.png"/> </imageobject></mediaobject><mediaobject>
-<imageobject> <imagedata fileref="live-diskdrake2.png"/> </imageobject></mediaobject></para>
+<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake2.png"
+align="center"/> </imageobject> <imageobject condition="live"> <imagedata
+fileref="live-diskdrake2.png" align="center"/> </imageobject></mediaobject></para>
</note>
<note>
<para>若您使用传统的硬件+GPT硬盘分区，请确保您设置了 BIOS 引导分区，并且为其指定了正确的分区标志</para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-doPartitionDisks3.png"/>
-</imageobject> <imageobject> <imagedata
-fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-doPartitionDisks3.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-doPartitionDisks3.png" align="center"/> </imageobject></mediaobject>
</note>
</section> \ No newline at end of file
diff --git a/docs/installer/zh_CN/doPartitionDisks.xml b/docs/installer/zh_CN/doPartitionDisks.xml
index 52d27388..aa7f2831 100644
--- a/docs/installer/zh_CN/doPartitionDisks.xml
+++ b/docs/installer/zh_CN/doPartitionDisks.xml
@@ -17,12 +17,10 @@ lebarhon 20170209 added SC-->
<para xml:id="doPartitionDisks-pa2" revision="1">根据特定硬盘布局和内容的不同，下列选项可能会有所不同。</para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-doPartitionDisks.png" align="center"/>
-</imageobject></mediaobject>
-
- <mediaobject>
-<imageobject> <imagedata fileref="live-doPartitionDisks.png"/>
-</imageobject></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>
@@ -51,12 +49,10 @@ lebarhon 20170209 added SC-->
的分区位置。您可以点击和拖动目标分区之间的空隙以便更改分区大小（参见下面的截图）。</para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-doPartitionDisks2.png"/>
-</imageobject></mediaobject>
-
- <mediaobject>
-<imageobject> <imagedata fileref="live-doPartitionDisks2.png"/>
-</imageobject></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>
@@ -115,12 +111,10 @@ lebarhon 20170209 added SC-->
左右，且不会被挂载。请选择“自定义磁盘分区”，然后手动创建一个 BIOS 引导分区。</para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-doPartitionDisks3.png"/>
-</imageobject></mediaobject>
-
- <mediaobject>
-<imageobject> <imagedata fileref="live-doPartitionDisks3.png"/>
-</imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-doPartitionDisks3.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
<mediaobject>
<imageobject> <imagedata fileref="dx2-doPartitionDisks4.png"/>
diff --git a/docs/installer/zh_CN/reboot.xml b/docs/installer/zh_CN/reboot.xml
index 2ee11214..1af1db3d 100644
--- a/docs/installer/zh_CN/reboot.xml
+++ b/docs/installer/zh_CN/reboot.xml
@@ -1,21 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_CN" xml:id="reboot">
+<?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="reboot">
<!--Lebarhon 20170210 updated for Mageia6-->
<info>
<title xml:id="reboot-ti1">重新启动</title>
</info>
-
-
-
-
+
<para>一旦安装了引导器，安装程序将会提示您重启电脑，此时请移除 Live CD 并重启。请点击<emphasis
role="bold"><guibutton>完成</guibutton></emphasis>并<emphasis
role="bold">根据提示的步骤</emphasis>进行操作。</para>
-
<mediaobject>
<imageobject> <imagedata fileref="live-reboot2.png"/> </imageobject></mediaobject>
-
<para>重启后，您将会看到一系列下载进度条，它将提示您正在下载的软件媒体（参见“软件管理”）。</para>
-
<mediaobject condition="live">
<imageobject> <imagedata format="PNG" xml:id="reboot-im1"
fileref="live-reboot.png" align="center" revision="1"/> </imageobject></mediaobject>
diff --git a/docs/installer/zh_CN/setupBootloader.xml b/docs/installer/zh_CN/setupBootloader.xml
index 16c9e18e..742042ab 100644
--- a/docs/installer/zh_CN/setupBootloader.xml
+++ b/docs/installer/zh_CN/setupBootloader.xml
@@ -34,10 +34,9 @@ Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<title>GRUB2，当使用传统硬件 + MBR/GPT 格式分区时</title>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-setupBootloader.png"/> </imageobject></mediaobject>
-
- <mediaobject>
-<imageobject> <imagedata xml:id="setupBootloader-im1"
+<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>
@@ -49,11 +48,10 @@ fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
<para>对于 UEFI，用户界面会稍有不同，您将无法选择引导器（因为只能使用 Grub2-efi）。</para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-setupBootloader2.png"/> </imageobject></mediaobject>
-
- <mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader2.png"/>
-</imageobject></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，并添加
@@ -82,11 +80,10 @@ grub2-efi。尽管多个 ESP 可以共存，但只需一个 ESP 即可满足启
这么做，请点击<guibutton>下一步</guibutton>，然后取消勾选<guilabel>检测其他操作系统</guilabel></para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-setupBootloader3.png"/> </imageobject></mediaobject>
-
- <mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader3.png"/>
-</imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader3.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader3.png" align="center"/> </imageobject></mediaobject>
</section>
<section>
@@ -104,11 +101,10 @@ Mageia，请点击<guibutton>下一步</guibutton>，然后点击<guibutton>高
<guilabel>不要修改 ESP 或 MBR</guilabel>。</para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-setupBootloader4.png"/> </imageobject></mediaobject>
-
- <mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader4.png"/>
-</imageobject></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>
@@ -144,29 +140,21 @@ Mageia，请点击<guibutton>下一步</guibutton>，然后点击<guibutton>高
<itemizedlist>
<listitem>
- <para><guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power
-Interface) is a standard for the power management. It can save energy by
-stopping unused devices, this was the method used before APM. Uncheck it be
-useful, for example, if your computer does not support ACPI or if you think
-the ACPI implementation might cause some problems (for instance random
-reboots or system lockups).</para>
+ <para>ACPI（高级配置与电源接口）是标准的电源管理协议。它可以关闭未使用的设备以节能，用于取代 APM。如果您的硬件不兼容 ACPI，或者您认为 ACPI
+会造成某些问题（如偶尔会自动重启，或系统卡死），则可以取消勾选它。</para>
</listitem>
<listitem>
- <para><guilabel>Enable SMP</guilabel>: This option enables / disables symmetric
-multiprocessing for multi core processors.</para>
+ <para><guilabel>启用 SMP</guilabel>：此选项启用或禁用多核处理器上的对称多处理器特性。</para>
</listitem>
<listitem>
- <para><guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the
-operating system access to the Advanced Programmable Interrupt
-Controller. APIC devices permit more complex priority models, and Advanced
-IRQ (Interrupt Request) management.</para>
+ <para><guilabel>启用 APIC</guilabel>：启用或禁用高级可编程中断控制器。APIC 设备可以支持更复杂的优先级模型和高级
+IRQ（中断请求）管理功能。</para>
</listitem>
<listitem>
- <para><guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which
-manage all external interrupts for some specific processor in an SMP system.</para>
+ <para><guilabel>启用本地 APIC</guilabel>：您可以在这里设置本地 APIC，用于在 SMP 系统中管理某个特定处理器的所有外部中断。</para>
</listitem>
</itemizedlist>
</listitem>
generated by cgit v1.2.1 (git 2.21.0) at 2024-06-30 00:55:56 +0000