Sync all translations

1 files changed, 160 insertions, 113 deletions

diff --git a/docs/docs/stable/installer/zh_CN/doPartitionDisks.xml b/docs/docs/stable/installer/zh_CN/doPartitionDisks.xml
index 6d36aa94..e099a0ed 100644
--- a/docs/docs/stable/installer/zh_CN/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/zh_CN/doPartitionDisks.xml
@@ -1,160 +1,207 @@
-<?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">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_CN" xml:id="doPartitionDisks"
+         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">
   
 
   
 
-  <info>
-    <!---->
-<!-- lebarhon 20161216 updated for Mageia 6
+  
+
+  
 
+  
+
+  
+
+  
+
+  <info>
+    <!--lebarhon 20161216 updated for Mageia 6
+  
 lebarhon 20170209 added SC-->
-<title xml:id="doPartitionDisks-ti1">分区</title>
+<!--2018/02/12 apb: Text and typography. Added link to diskdrake in 2nd Note-->
+<!--2018/02/17 apb: Centre-align last two PNG's. Also, fix some wonky XML formatting.-->
+<!--2018/02/17 apb: Moved 'Erase ...' & 'Custom ...' list items up with the other list items. I can see the reason for splitting the list with the example SC, 
+  but I think this way is clearer (flow) overall. I don't believe that combining the list will interfere with the example SC and the relevant list item.-->
+<!--2018/02/21 apb: Changed list styles.-->
+<!--2018/02/24 apb: Changed list styles.-->
+<!--2019/01/11 apb: Auto allocation of drive space rules: small edits for style consistency.-->
+<title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
 
-  <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 revision="1" xml:id="doPartitionDisks-pa1">In this screen you can see the content of your hard drive(s) along with the
+DrakX partitioning proposals for where to install Mageia.</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>
+  <para revision="1" xml:id="doPartitionDisks-pa2">The actual 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>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks.png"/> </imageobject></mediaobject>
 
-        <para xml:id="doPartitionDisks-pa5" revision="1">若此选项可用，表面安装程序找到了现存的 Linux 分区，并且可以将其用于 Mageia 的安装。</para>
-      </listitem>
+  <itemizedlist>
+    <title>Main Options</title>
 
-      <listitem>
-        <para xml:id="doPartitionDisks-pa6" revision="1">使用空闲空间</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa4"><emphasis role="bold">Use Existing Partitions</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa7" revision="1">若硬盘上有未使用的区域，此选项将会把 Mageia 安装到该区域中。</para>
-      </listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa5">若此选项可用，表面安装程序找到了现存的 Linux 分区，并且可以将其用于 Mageia 的安装。</para>
+    </listitem>
 
-      <listitem>
-        <para xml:id="doPartitionDisks-pa8" revision="1">使用 Windows 分区中的空闲空间</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa6"><emphasis role="bold">Use Free Space</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa9" revision="1">若现存 Windows 分区中有空闲空间，安装程序将把 Mageia 安装在此处。</para>
+      <para revision="1" xml:id="doPartitionDisks-pa7">若硬盘上有未使用的区域，此选项将会把 Mageia 安装到该区域中。</para>
+    </listitem>
 
-        <para xml:id="doPartitionDisks-pa10" revision="2">此选项可用于为 Mageia 腾出安装空间，但操作过程有一定风险。请您确保已经备份了所有重要文件！</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa8"><emphasis role="bold">Use Free Space on a Windows Partition</emphasis></para>
 
-        <para revision="3" xml:id="doPartitionDisks-pa11">将会缩小 Windows 分区的大小。该分区必须为“clean”状态，即上一次使用 Windows
-时必须正常地关机或重启。同时，该分区也应当进行碎片整理，即便不能将文件碎片完全移出待使用区域。我们推荐您对个人文件进行备份后再进行此操作。</para>
+      <para revision="1" xml:id="suggestedPartitioning-pa9">If you have unused space on an existing Windows partition, the installer may
+offer to use it. This can be a useful way of making room for your new Mageia
+installation, but is a risky operation so you should make sure you have
+backed up all important files!</para>
 
-        <para>With this option, the installer displays the remaining Windows partition in
+      <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>
+clicking and dragging the gap between both partitions.  See the following
+screenshot:</para>
+    </listitem>
 
-        <para xml:id="doPartitionDisks-pa14" revision="1">注意！将会删除所选驱动器上的所有数据！请谨慎操作！</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa12"><emphasis role="bold">Erase and use Entire Disk</emphasis></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 revision="1" xml:id="doPartitionDisks-pa13">This option will allocate the entire drive for Mageia</para>
 
-        <para xml:id="doPartitionDisks-pa17" revision="1">允许您完全控制系统在硬盘上的安装方式。</para>
-      </listitem>
-    </itemizedlist></para>
+      <warning>
+        <para revision="1" xml:id="doPartitionDisks-pa14">This will erase ALL data on the selected hard drive. Take care! If you
+intend to use part of the disk for something else, or you already have data
+on the drive that you are not prepared to lose, then do not use this option.</para>
+      </warning>
 
-  <para><emphasis role="bold">Partition sizing:</emphasis></para>
+      <important>
+        <para revision="3" xml:id="doPartitionDisks-pa11">将会缩小 Windows 分区的大小。该分区必须为“clean”状态，即上一次使用 Windows
+时必须正常地关机或重启。同时，该分区也应当进行碎片整理，即便不能将文件碎片完全移出待使用区域。我们推荐您对个人文件进行备份后再进行此操作。</para>
+      </important>
+    </listitem>
 
-  <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>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa16"><emphasis role="bold">Custom Disk Partitioning</emphasis></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>
+      <para revision="1" xml:id="doPartitionDisks-pa17">允许您完全控制系统在硬盘上的安装方式。</para>
+    </listitem>
+  </itemizedlist>
 
-      <listitem>
-        <para>If the total available space is greater than 50 GB, then three partitions
+  <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject>
+
+  <para>If you are not using the <emphasis>Custom disk partitioning</emphasis>
+option, then the installer will allocate the available space according to
+the following rules:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>If the total available space is less than 50 GB, then only one partition is
+created. This will be the <filename>/</filename> (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>
+      <itemizedlist>
+        <listitem>
+          <para>6/19 of the total available place is allocated to <filename>/</filename>
+with a maximum of 50 GB</para>
+        </listitem>
+
+        <listitem>
+          <para>1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB</para>
+        </listitem>
+
+        <listitem>
+          <para>the rest (at least 12/19) is allocated to <filename>/home</filename></para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+  </itemizedlist>
+
+  <para>This means that from 160 GB or greater available space, the installer will
+create three partitions:</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>
+  <itemizedlist>
+    <listitem>
+      <para>50 GB for <filename>/</filename></para>
+    </listitem>
+
+    <listitem>
+      <para>4 GB for <filename>swap</filename></para>
+    </listitem>
+
+    <listitem>
+      <para>and the remainder for <filename>/home</filename></para>
+    </listitem>
+  </itemizedlist>
 
   <note>
     <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>
+automatically detected - or created if it does not exist yet - and mounted
+on <filename>/boot/EFI</filename>. The <emphasis>Custom disk
+partitioning</emphasis> option is the only one that allows to check it has
+been correctly done.</para>
+
+    <para>If you are using a Legacy (also known as BIOS) system with a GPT partitioned
+disk, you need to create a BIOS boot partition if it doesn't already
+exist. It should be about 1 MiB with no mount point. It can be created with
+the Installer, under <emphasis>Custom disk partitioning</emphasis>, like any
+other partition. Be sure to select <quote>BIOS boot partition</quote> for
+filesystem type.</para>
+
+    <para>See <xref linkend="diskdrake"/> for information on how to proceed.</para>
   </note>
 
-  <note>
-    <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>
+  <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-doPartitionDisks3.png"/>
-</imageobject></mediaobject>
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
 
-    <mediaobject>
-<imageobject> <imagedata fileref="dx2-doPartitionDisks4.png"/>
-</imageobject></mediaobject>
-  </note>
+  <mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
 
-  <warning>
+  <important>
     <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>
+drive.</para>
+
+    <para>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 gparted, and to use the following
+settings:</para>
 
-    <para><emphasis role="bold">Align to</emphasis> = MiB</para>
+    <itemizedlist>
+      <listitem>
+        <para><emphasis>Align to</emphasis> = MiB</para>
+      </listitem>
 
-    <para><emphasis role="bold">Free space preceding (MiB)</emphasis> = 2</para>
+      <listitem>
+        <para><emphasis>Free space preceding (MiB)</emphasis> = 2</para>
+      </listitem>
+    </itemizedlist>
 
     <para>Also make sure all partitions are created using an even number of megabytes.</para>
-  </warning>
-</section>
\ No newline at end of file
+  </important>
+</section>