Sync all translations

1 files changed, 67 insertions, 44 deletions

diff --git a/docs/docs/stable/installer/zh_CN/addUser.xml b/docs/docs/stable/installer/zh_CN/addUser.xml
index 986e54d3..88e2459d 100644
--- a/docs/docs/stable/installer/zh_CN/addUser.xml
+++ b/docs/docs/stable/installer/zh_CN/addUser.xml
@@ -1,32 +1,51 @@
-<?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 version="5.0" xml:lang="zh_CN" xml:id="addUser" 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">
   <info>
-    <title xml:id="addUser-ti1">用户和管理员管理</title>
+    <title xml:id="addUser-ti1">User Management</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-setRootPassword.png" align="center" revision="1"
+<!--2018/02/12 apb: Text and Typography.-->
+<!--2018/02/19 apb: Update dx2-setRootPassword.png to Mga6.-->
+<!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
+  Also changed 'Advanced User Management' to 'User Management (advanced)'.-->
+<!--2018/02/24 apb: Changed list style.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setRootPassword.png" format="PNG" revision="1"
 xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-format="PNG" fileref="live-user1.png"/> </imageobject></mediaobject>
+fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
   <section xml:id="root-password">
     <info>
       <title xml:id="root-password-ti2">设置管理员（root 账户）密码：</title>
     </info>
 
-    <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>
+    <para>It is advisable for all Mageia installations to set a
+<literal>superuser</literal> (Administrator) password, usually called the
+<emphasis>root </emphasis>password 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>All passwords are case sensitive. It is best to use a mixture of letters
+      <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>
@@ -36,41 +55,46 @@ underneath, to check that the first entry was not mistyped.</para>
       <title xml:id="enterUser-ti3">输入用户名</title>
     </info>
 
-    <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>
+    <para>Add a User here. A regular user has fewer privileges than the
+<literal>superuser</literal> (root), but enough to use the Internet, office
+applications or play games and anything else the average user might use a
+computer for.</para>
 
     <itemizedlist>
       <listitem>
-        <para><guibutton>图标</guibutton>：若点击此按钮，则会改变用户图标。</para>
-      </listitem>
+        <para><emphasis role="bold">Icon</emphasis></para>
 
-      <listitem>
-        <para><guilabel>真实姓名</guilabel>：在文本框中输入用户的真名。</para>
+        <para>Click on this button if you want to change the user's icon</para>
       </listitem>
 
       <listitem>
-        <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>
+        <para><emphasis role="bold">Real Name</emphasis></para>
+
+        <para>Insert the user's real name into this text box</para>
       </listitem>
 
       <listitem>
-        <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>
+        <para><emphasis role="bold">Login Name</emphasis></para>
+
+        <para>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>Password (again)</guilabel>: Retype the user password DrakX will
-check that you have not mistyped the password.</para>
+        <para><emphasis role="bold">Password</emphasis></para>
+
+        <para>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>
+
+        <para><emphasis role="bold">Password (again):</emphasis> Retype the user
+password. DrakX will check that you have not mistyped the password.</para>
       </listitem>
     </itemizedlist>
 
     <note>
-      <para>Any users you added while installing Mageia, will have a home directory that
-is both read and write protected (umask=0027).</para>
+      <para>Any users 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
@@ -80,32 +104,31 @@ management</emphasis>.</para>
     </note>
   </section>
 
-  <section xml:id="addUserAdvanced" condition="classical">
+  <section condition="classical" xml:id="addUserAdvanced">
     <info>
-      <title xml:id="addUserAdvanced-ti3">高级用户管理</title>
+      <title xml:id="addUserAdvanced-ti3">User Management (advanced)</title>
     </info>
 
-    <para>The <guibutton>Advanced</guibutton> option allows you to edit further
-settings for the user you are adding.</para>
+    <para>The <emphasis>Advanced</emphasis> option allows you to edit further settings
+for the user you are adding.</para>
 
     <itemizedlist>
       <listitem>
-        <para><guilabel>Shell</guilabel>: This drop-down list allows you to change the
+        <para><emphasis>Shell</emphasis>: 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>
+<literal>Bash</literal>, <literal>Dash</literal> and <literal>Sh</literal></para>
       </listitem>
 
       <listitem>
-        <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>
+        <para><emphasis>User ID</emphasis>: Here you can set the user ID 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>Group ID</guilabel>: This lets you set the <emphasis
-role="bold">group ID</emphasis>. Again, if unsure, leave it blank.</para>
+        <para><emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if
+unsure, leave it blank.</para>
       </listitem>
     </itemizedlist>
   </section>
-</section>
\ No newline at end of file
+</section>