Sync all translations

1 files changed, 157 insertions, 149 deletions

diff --git a/docs/docs/stable/installer/zh_CN/installer.xml b/docs/docs/stable/installer/zh_CN/installer.xml
index 7dd32d1f..1f79636e 100644
--- a/docs/docs/stable/installer/zh_CN/installer.xml
+++ b/docs/docs/stable/installer/zh_CN/installer.xml
@@ -6,160 +6,162 @@
          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="installer-ti1">DrakX，Mageia 的安装器</title>
-  </info>
+  
 
-  <para>无论您是刚接触 GNU-Linux 的新人，还是老手，Mageia 安装器都能帮您轻松安装或升级系统。</para>
+  
 
-  <para>初始页中有很多选项，安装器将会选择其中的默认项（一般是您所需的）。</para>
+  
 
-  <section>
-    <title>安装欢迎屏幕</title>
+  
 
-    <section>
-      <title>Using a Mageia DVD</title>
+  
 
-      <para>Here are the default welcome screens when using a Mageia DVD, The first one
-is what you will see if you have a UEFI system, the second one is for a
-Legacy system:</para>
+  
 
-      <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome2.png"/> </imageobject></mediaobject>
+  
 
-      <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 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>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>Use the arrow keys to select the language then press <emphasis
-role="bold">Enter</emphasis>.</para>
-          </listitem>
-
-          <listitem>
-            <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>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>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>
-<imageobject> <imagedata fileref="dx-welcome6opt.png"/> </imageobject></mediaobject>
-          </listitem>
-
-          <listitem>
-            <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>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>The help is translated in the chosen language with <emphasis
-role="bold">F2</emphasis>.</para>
-            </note>
-
-            <para>有关传统引导和 UEFI 引导的内核选项，请参考：<link
-ns2:href="https://wiki.mageia.org/en/How_to_set_up_kernel_options">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link>。</para>
-          </listitem>
-        </itemizedlist></para>
-    </section>
-  </section>
+  
+
+  
+
+  <info>
+    <!--2018/02/11 apb: Text and typography. F6 Default option needs to be better defined.-->
+<!--2018/02/17 apb: Removed instances of surplus para tags from before and after some itemizedlist tags. These were present in the import from Mga6 WS.
+  Some listitem end-tags were directly after mediaobject end-tags, while the main listitem element was above the mediaobject.
+  So I moved the listitem end-tags above the mediaobjects, to their natural positions. This also was in the imported XML.-->
+<!--2018/02/19 apb: Updated welcome.png to Mga6.-->
+<!--2018/02/21 apb: a) Updated rest of BIOS PNG's, b) Refined text and reworked this XML.-->
+<!--2018/02/24 apb: Changed main list type-->
+<!--2018/02/25 apb: Split 1,1 Caution into 2 paras.-->
+<!--2018/02/27 apb: Fixed UEFI section nest level.-->
+<!--2018/03/16 apb: Fixed incorrect value for title installer-ti1 (leading to output error since last year in Documentation Workspace - and inherited here, when imported).-->
+<!--2019/01/02 apb: 1.2 Typo. 1.2.1: Update dx-welcome.png (BIOS Welcome screen) to Mga7 and strip text for the options which have been removed from the Mga7 Welcome screen.-->
+<!--2019/01/08 apb: 1.2.2: Update dx-welcome2.png (UEFI Welcome screen) to Mga7 and add text for F2 Languages option.-->
+<title xml:id="installer-ti1">DrakX，Mageia 的安装器</title>
+  </info>
+
+  <para>无论您是刚接触 GNU-Linux 的新人，还是老手，Mageia 安装器都能帮您轻松安装或升级系统。</para>
 
   <section>
     <title>安装步骤</title>
 
-    <para>The install process is divided into a number of steps, the status of which
+    <itemizedlist>
+      <listitem>
+        <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>
+      </listitem>
 
-    <para>Each step has one or more screens which may also have
-<guibutton>Advanced</guibutton> sections with extra, less commonly required,
+      <listitem>
+        <para>Each step has one or more screens, which may also have
+<emphasis>Advanced</emphasis> sections with extra, less commonly required
 options.</para>
+      </listitem>
 
-    <para>Most screens have <guibutton>Help</guibutton> buttons for further details
+      <listitem>
+        <para>Most screens have <emphasis>Help</emphasis> buttons for further details
 about the particular step.</para>
+      </listitem>
+    </itemizedlist>
 
-    <note>
-      <para>If at some points during the install you decide to stop the installation, it
+    <caution>
+      <para>If at some point during the install you decide to abort the installation, it
 is possible to reboot, but please think twice before you do this. Once a
 partition has been formatted or updates have started to be installed, your
 computer is no longer in the same state and rebooting it could very well
-leave you with an unusable system. 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>
+leave you with an unusable system.</para>
+
+      <para>If, in spite of this, you are very sure rebooting is what you want, go to a
+text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F2</keycap> </keycombo> together. After that,
+press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Delete</keycap> </keycombo> together to reboot.</para>
+    </caution>
+  </section>
+
+  <section>
+    <title>安装欢迎屏幕</title>
+
+    <para>The particular screen that you will first see when booting from the
+Installation media will depend on whether your computer motherboard is of
+the Legacy (BIOS) or UEFI type.</para>
+
+    <para>The welcome menu screen has various options, however the default option will
+start the installer, and is normally all that you will need.</para>
+
+    <section>
+      <title>Legacy (BIOS) Systems</title>
+
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome.png"/>
+</imageobject></mediaobject>
+
+      <itemizedlist>
+        <title>Menu</title>
+
+        <listitem>
+          <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+          <para>Install Mageia to a hard disk. This is the default option, and will
+automatically start after a short while unless another option is selected.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue System</emphasis></para>
+
+          <para>This option allows you to either re-install the bootloader for an existing
+Mageia installation or you can use it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Memory Test</emphasis></para>
+
+          <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language</emphasis></para>
+
+          <para>Press F2 for alternative languages.</para>
+        </listitem>
+      </itemizedlist>
+    </section>
+
+    <section>
+      <title>UEFI Systems</title>
+
+      <para>From this screen, you can access options by pressing <keycap>e</keycap> to
+enter the edit mode. To come back to this screen, press <keycap>Esc</keycap>
+to quit without saving or press <keycap>F10</keycap> to save and quit.</para>
+
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome2.png"/>
+</imageobject></mediaobject>
+
+      <itemizedlist>
+        <title>Menu</title>
+
+        <listitem>
+          <para><emphasis role="bold">Install:</emphasis> Start the Install process</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue:</emphasis> This option allows you to either
+re-install the bootloader for an existing Mageia installation or you can use
+it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language:</emphasis> Press <keycap>F2</keycap> for
+alternative languages.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you booted from a USB stick, you will see the above options duplicated,
+and in this case, you should use the set that will be suffixed with "USB".</para>
+    </section>
   </section>
 
   <section>
@@ -170,18 +172,20 @@ rebooting is what you want, go to a text terminal by pressing the three keys
 
       <itemizedlist>
         <listitem>
-          <para>在初始屏幕之后，可能无法显示语言选择窗口。这中情况可能发生在部分显卡和较老的系统中。请尝试在提示后输入 <code>vgalo</code>
-来切换到较低分辨率。</para>
+          <para>After the initial screen you did not progress to the <emphasis>Language
+Selection</emphasis> screen. This can happen with some graphic cards and
+older systems. Try using low resolution by typing <command>vgalo</command>
+at the prompt.</para>
         </listitem>
 
         <listitem>
           <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>
+possible. In this case it is worth trying a text-mode installation. To use
+this press <keycap>Esc</keycap> at the <emphasis>Welcome</emphasis> screen
+and confirm with <keycap>ENTER</keycap>. You will be presented with a black
+screen with a <prompt>boot:</prompt> prompt. Type <command>text</command>
+and press <keycap>ENTER</keycap> to continue with the installation in text
+mode.</para>
         </listitem>
       </itemizedlist>
     </section>
@@ -189,8 +193,11 @@ text mode.</para>
     <section>
       <title>安装停止</title>
 
-      <para>若系统在安装过程中停止响应（卡死），可能是硬件检测过程出现问题。在这种情况下，可以先跳过硬件检测过程：在命令提示后输入
-<code>noauto</code>。此选项也可以与其他选项联合使用。</para>
+      <para>If the system appeared to freeze during the installation, this may be a
+problem with hardware detection. In this case the automatic hardware
+detection may be bypassed and dealt with later. To try this, type
+<command>noauto</command> at the prompt. This option may also be combined
+with other parameters as necessary.</para>
     </section>
 
     <section>
@@ -198,17 +205,18 @@ text mode.</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>
+<literal>mem=<replaceable>xxx</replaceable>M</literal> parameter, where
+<replaceable>xxx</replaceable> is the correct amount of
+RAM. e.g. <literal>mem=256M</literal> would specify 256MB of RAM.</para>
     </section>
 
     <section>
       <title>动态分区</title>
 
-      <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
+      <para>If you converted your hard disk from <literal>Basic</literal> format to
+<literal>Dynamic</literal> format in Microsoft Windows, then it is not
+possible to install Mageia on this disc. To revert to a
+<literal>Basic</literal> disk, see the Microsoft documentation: <link
 ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
     </section>
   </section>