From 42c5809ffabd57b53bfd9e9143bd5cd1c50ba843 Mon Sep 17 00:00:00 2001
From: Papoteur <papoteur@mageia.org>
Date: Sun, 3 Jan 2021 16:13:45 +0100
Subject: Update zh_cn

---
 zh_cn/selectInstallClass.html | 62 ++++++++++++++++++++-----------------------
 1 file changed, 29 insertions(+), 33 deletions(-)

(limited to 'zh_cn/selectInstallClass.html')

diff --git a/zh_cn/selectInstallClass.html b/zh_cn/selectInstallClass.html
index 19b9c9f..b7c682a 100644
--- a/zh_cn/selectInstallClass.html
+++ b/zh_cn/selectInstallClass.html
@@ -32,66 +32,61 @@
          
          
          
+         
+         
+         
+         
+         
+         
+         
+         
            
          
            
          
            
          <div class="itemizedlist">
-            <ul class="itemizedlist">
+            <ul class="itemizedlist" compact>
                <li class="listitem">
                         
-                  <p>&#23433;&#35013;</p>
+                  <p><span class="bold"><strong>Install</strong></span></p>
                   
                         
-                  <p>&#20351;&#29992;&#27492;&#36873;&#39033;&#26469;&#36827;&#34892;&#20840;&#26032; <span class="application">Mageia</span> &#23433;&#35013;&#12290;
+                  <p>Use this option to perform a fresh installation of Mageia. This will format
+                     the <code class="literal">root</code> partition (<code class="filename">/</code>), but can
+                     preserve a pre-existing <code class="filename">/home</code> partition (a dedicated
+                     /home partition, rather than being incorporated within the root (/)
+                     partition itself).
                   </p>
                       
                </li>
                <li class="listitem">
                         
-                  <p>&#21319;&#32423;</p>
+                  <p><span class="bold"><strong>Upgrade</strong></span></p>
                   
                         
-                  <p>&#33509;&#24744;&#22312;&#30005;&#33041;&#19978;&#23433;&#35013;&#20102;&#22810;&#20010; <span class="application">Mageia</span>&#65292;&#23433;&#35013;&#31243;&#24207;&#23558;&#20250;&#20801;&#35768;&#24744;&#36873;&#25321;&#38656;&#35201;&#21319;&#32423;&#30340;&#31995;&#32479;&#12290;
-                  </p>
-                  
-                  
-                  <div class="warning" title="&#35686;&#21578;" style="margin-left: 0.5in; margin-right: 0.5in;">
-                     <table border="0" summary="Warning">
-                        <tr>
-                           <td rowspan="2" align="center" valign="top" width="25"><img alt="[&#35686;&#21578;]" src="warning.png"></td>
-                           <th align="left"></th>
-                        </tr>
-                        <tr>
-                           <td align="left" valign="top">
-                              	
-                              <p>&#25105;&#20204;&#21482;&#27979;&#35797;&#20102;&#20174;&#24403;&#21069; <span class="emphasis"><em>&#23578;&#34987;&#25903;&#25345;</em></span>&#30340;&#21457;&#34892;&#29256;&#36827;&#34892;&#30340;&#21319;&#32423;&#36807;&#31243;&#12290;&#22914;&#26524;&#24744;&#24076;&#26395;&#20174;&#24050;&#32463;&#32467;&#26463;&#25903;&#25345;&#30340; Mageia
-                                 &#29256;&#26412;&#21319;&#32423;&#21040;&#26368;&#26032;&#29256;&#26412;&#65292;&#25105;&#20204;&#24314;&#35758;&#24744;&#26368;&#22909;&#36827;&#34892;&#20840;&#26032;&#23433;&#35013;&#65292;&#21516;&#26102;&#20445;&#30041;&#24744;&#30340; <code class="literal">/home</code> &#20998;&#21306;&#12290;
-                              </p>
-                              
-                           </td>
-                        </tr>
-                     </table>
-                  </div>
+                  <p>Use this option to upgrade an existing installation of Mageia.</p>
                       
                </li>
             </ul>
          </div>
          
            
-         <div class="note" title="&#27880;&#24847;" style="margin-left: 0.5in; margin-right: 0.5in;">
-            <table border="0" summary="Note">
+         <div class="important" title="&#37325;&#35201;" style="margin-left: 0.5in; margin-right: 0.5in;">
+            <table border="0" summary="Important">
                <tr>
-                  <td rowspan="2" align="center" valign="top" width="25"><img alt="[&#27880;&#24847;]" src="note.png"></td>
+                  <td rowspan="2" align="center" valign="top" width="25"><img alt="[&#37325;&#35201;]" src="important.png"></td>
                   <th align="left"></th>
                </tr>
                <tr>
                   <td align="left" valign="top">
                          
-                     <p>&#33509;&#23433;&#35013;&#36807;&#31243;&#22312;&#26576;&#19968;&#27493;&#20013;&#26029;&#65292;&#24744;&#21487;&#20197;&#36873;&#25321;&#37325;&#21551;&#65292;&#20294;&#35831;&#19977;&#24605;&#32780;&#21518;&#34892;&#12290;&#19968;&#26086;&#20998;&#21306;&#34987;&#26684;&#24335;&#21270;&#65292;&#25110;&#21319;&#32423;&#36807;&#31243;&#24320;&#22987;&#65292;&#30005;&#33041;&#20013;&#30340;&#20869;&#23481;&#23558;&#21457;&#29983;&#21464;&#21270;&#65292;&#27492;&#26102;&#37325;&#21551;&#21487;&#33021;&#23548;&#33268;&#31995;&#32479;&#26080;&#27861;&#20351;&#29992;&#12290;&#33509;&#24744;&#30830;&#23450;&#35201;&#37325;&#21551;&#65292;&#21487;&#20197;&#25353;
-                        <span class="guibutton">Alt Ctrl F2</span> &#20999;&#25442;&#21040;&#32456;&#31471;&#65292;&#28982;&#21518;&#25353;&#19979; <span class="guibutton">Alt Ctrl
-                           Delete</span> &#26469;&#35302;&#21457;&#37325;&#21551;&#25805;&#20316;&#12290;
+                     <p>Only upgrading from a previous Mageia version that was <span class="emphasis"><em>still
+                              supported</em></span> when this Installer's version was released, has been
+                        thoroughly tested. If you want to upgrade a Mageia version that has reached
+                        its <span class="quote">&#8220;<span class="quote">End Of Life</span>&#8221;</span> then it is better to do a
+                        <span class="quote">&#8220;<span class="quote">clean</span>&#8221;</span> install instead, while preserving your
+                        <code class="filename">/home</code> partition.
                      </p>
                        
                   </td>
@@ -109,8 +104,9 @@
                <tr>
                   <td align="left" valign="top">
                          
-                     <p>&#33509;&#24744;&#24536;&#35760;&#36873;&#25321;&#26576;&#19968;&#38468;&#21152;&#35821;&#35328;&#65292;&#24744;&#21487;&#20197;&#22238;&#21040;&#8220;&#23433;&#35013;&#25110;&#21319;&#32423;&#8221;&#30028;&#38754;&#65292;&#28982;&#21518;&#25353;&#19979;&#26469; <span class="guilabel">Alt Ctrl Home</span>
-                        &#24182;&#36827;&#34892;&#36873;&#25321;&#12290;&#35831;<span class="emphasis"><em>&#19981;&#35201;</em></span>&#22312;&#23433;&#35013;&#21518;&#20877;&#36827;&#34892;&#28155;&#21152;&#12290;
+                     <p>If you have discovered that you forgot to select an additional language, you
+                        can return from the <span class="emphasis"><em>Install or Upgrade</em></span> screen to the
+                        language choice screen by pressing <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>Alt</strong></span>+<span class="keycap"><strong>Home</strong></span>. Do<span class="bold"><strong> NOT</strong></span> do this later in the install.
                      </p>
                        
                   </td>
-- 
cgit v1.2.1