aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--zh_cn/Select-and-use-ISOs.html400
-rw-r--r--zh_cn/acceptLicense.html47
-rw-r--r--zh_cn/addUser.html138
-rw-r--r--zh_cn/configureServices.html40
-rw-r--r--zh_cn/diskPartitioning.html716
-rw-r--r--zh_cn/exitInstall.html13
-rw-r--r--zh_cn/firewall.html95
-rw-r--r--zh_cn/graphicalConfiguration.html363
-rw-r--r--zh_cn/index.html119
-rw-r--r--zh_cn/installUpdates.html42
-rw-r--r--zh_cn/installer.html409
-rw-r--r--zh_cn/locale.html196
-rw-r--r--zh_cn/misc-params.html151
-rw-r--r--zh_cn/securityLevel.html55
-rw-r--r--zh_cn/selectInstallClass.html62
-rw-r--r--zh_cn/selectKeyboard.html27
-rw-r--r--zh_cn/selectLanguage.html66
-rw-r--r--zh_cn/selectMouse.html13
-rw-r--r--zh_cn/setupBootloader.html503
-rw-r--r--zh_cn/setupSCSI.html19
-rw-r--r--zh_cn/software.html422
-rw-r--r--zh_cn/soundConfig.html25
-rw-r--r--zh_cn/uninstall-Mageia.html71
23 files changed, 3132 insertions, 860 deletions
diff --git a/zh_cn/Select-and-use-ISOs.html b/zh_cn/Select-and-use-ISOs.html
index 710a338..46174c4 100644
--- a/zh_cn/Select-and-use-ISOs.html
+++ b/zh_cn/Select-and-use-ISOs.html
@@ -22,6 +22,12 @@
</div>
</div>
</div>
+
+
+
+
+
+
@@ -36,26 +42,88 @@
</div>
- <p>Mageia &#36890;&#36807; ISO &#38236;&#20687;&#36827;&#34892;&#20998;&#21457;&#12290;&#27492;&#39029;&#23558;&#24110;&#21161;&#24744;&#36873;&#25321;&#25152;&#38656;&#30340;&#38236;&#20687;&#12290;</p>
+ <p>Mageia is distributed via ISO images. This page will help you to choose
+ which image best suits your needs.
+ </p>
- <p>&#26377;&#20004;&#31181;&#31867;&#22411;&#30340;&#23186;&#20171;&#65306;</p>
+ <p>There are three types of installation media:</p>
<div class="itemizedlist">
<ul class="itemizedlist">
<li class="listitem">
- <p>&#20256;&#32479;&#23433;&#35013;&#22120;&#65306;&#22312;&#24341;&#23548;&#20043;&#21518;&#65292;&#31243;&#24207;&#23558;&#25552;&#20379;&#19968;&#31995;&#21015;&#29992;&#20110;&#23433;&#35013;&#21644;&#37197;&#32622;&#30446;&#26631;&#31995;&#32479;&#30340;&#36873;&#39033;&#12290;&#36825;&#31181;&#23433;&#35013;&#31867;&#22411;&#21487;&#20197;&#32473;&#20104;&#24744;&#26368;&#22823;&#38480;&#24230;&#30340;&#28789;&#27963;&#24615;&#65292;&#23588;&#20854;&#26159;&#36873;&#25321;&#25152;&#38656;&#23433;&#35013;&#30340;&#26700;&#38754;&#29615;&#22659;&#12290;</p>
+ <p><span class="bold"><strong>Classical installer:</strong></span> Booting with this
+ media provides you with the maximum flexibility when choosing what to
+ install, and for configuring your system. In particular, you have a choice
+ of which Desktop environment to install.
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p><span class="bold"><strong>LIVE media:</strong></span> This option allows you to try
+ out Mageia without having to actually install it, or make any changes to
+ your computer. However, the Live media also includes an Installer, which can
+ be started when booting the media, or after booting into the Live operating
+ system itself.
+ </p>
+
+ <div class="note" title="&#27880;&#24847;" style="margin-left: 0.5in; margin-right: 0.5in;">
+ <table border="0" summary="Note">
+ <tr>
+ <td rowspan="2" align="center" valign="top" width="25"><img alt="[&#27880;&#24847;]" src="note.png"></td>
+ <th align="left"></th>
+ </tr>
+ <tr>
+ <td align="left" valign="top">
+
+ <p>The Live Installer is simpler compared to the Classical Installer - but you
+ have fewer configuration options.
+ </p>
+
+ </td>
+ </tr>
+ </table>
+ </div>
+
+ <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="[&#37325;&#35201;]" src="important.png"></td>
+ <th align="left"></th>
+ </tr>
+ <tr>
+ <td align="left" valign="top">
+
+ <p>Live ISOs can only be used to create <span class="quote">&#8220;<span class="quote">clean</span>&#8221;</span> installations,
+ they cannot be used to upgrade previously installed Mageia releases.
+ </p>
+
+ </td>
+ </tr>
+ </table>
+ </div>
</li>
<li class="listitem">
- <p>Live &#23186;&#20171;&#65306;&#24744;&#26080;&#38656;&#23454;&#38469;&#23433;&#35013;&#21363;&#21487;&#23454;&#38469;&#20307;&#39564; Mageia &#31995;&#32479;&#65292;&#20197;&#20415;&#30830;&#23450;&#31995;&#32479;&#34987;&#23433;&#35013;&#20043;&#21518;&#30340;&#27169;&#26679;&#12290;&#36825;&#31181;&#23433;&#35013;&#30340;&#36807;&#31243;&#26356;&#21152;&#31616;&#21333;&#65292;&#20294;&#24744;&#21487;&#20570;&#30340;&#36873;&#25321;&#20063;&#30456;&#24212;&#20943;&#23569;&#12290;</p>
+ <p><span class="bold"><strong>Net Install</strong></span>: These are minimal ISO's
+ containing no more than that which is needed to start the DrakX installer
+ and find <code class="literal">DrakX-installer-stage2</code> and other packages that
+ are needed to continue and complete the install. These packages may be on
+ the PC hard disk, on a local drive, on a local network or on the Internet.
+ </p>
+
+ <p>These media are very light (less than 100 MB) and are convenient if
+ bandwidth is too low to download a full DVD, or if you have a PC without a
+ DVD drive or is unable to boot from a USB stick.
+ </p>
</li>
</ul>
</div>
- <p>&#19979;&#19968;&#33410;&#20013;&#23558;&#28041;&#21450;&#26377;&#20851;&#32454;&#33410;&#12290;</p>
+ <p>More details are given in the next sections.</p>
</div>
@@ -63,7 +131,7 @@
<div class="titlepage">
<div>
<div>
- <h3 class="title"><a name="d5e29"></a>&#20171;&#36136;
+ <h3 class="title"><a name="d5e41"></a>&#20171;&#36136;
</h3>
</div>
</div>
@@ -74,16 +142,19 @@
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="d5e31"></a>&#23450;&#20041;
+ <h4 class="title"><a name="d5e43"></a>&#23450;&#20041;
</h4>
</div>
</div>
</div>
- <p>&#23186;&#20171;&#65306;&#26159;&#19968;&#31867;&#25215;&#36733; ISO &#25991;&#20214;&#12289;&#21487;&#20197;&#29992;&#20110;&#23433;&#35013;&#21644;/&#25110;&#26356;&#26032; Mageia &#30340;&#20219;&#24847;&#29289;&#29702;&#20171;&#36136;&#12290;</p>
+ <p>Here, a medium (plural: media) is an ISO image file that allows you to
+ install and/or update Mageia and, by extension, any physical medium (DVD,
+ USB stick, ...) the ISO file is copied to.
+ </p>
- <p>&#24744;&#21487;&#20197;&#22312;<a class="ulink" href="http://www.mageia.org/en/downloads/" target="_top">&#36825;&#37324;</a>&#25214;&#21040;&#23427;&#20204;&#12290;
+ <p>You can find Mageia ISO's <a class="ulink" href="http://www.mageia.org/en/downloads/" target="_top">here</a>.
</p>
</div>
@@ -92,7 +163,7 @@
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="d5e36"></a>&#20256;&#32479;&#23433;&#35013;&#23186;&#20171;
+ <h4 class="title"><a name="d5e48"></a>&#20256;&#32479;&#23433;&#35013;&#23186;&#20171;
</h4>
</div>
</div>
@@ -103,7 +174,7 @@
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e38"></a>&#36890;&#29992;&#29305;&#24615;
+ <h5 class="title"><a name="d5e50"></a>&#36890;&#29992;&#29305;&#24615;
</h5>
</div>
</div>
@@ -114,32 +185,36 @@
<ul class="itemizedlist">
<li class="listitem">
- <p>&#36825;&#20123; ISO &#20351;&#29992;&#20256;&#32479;&#30340;&#23433;&#35013;&#22120;&#65288;drakx&#65289;&#12290;</p>
+ <p>These ISOs use the Classical installer called DrakX</p>
</li>
<li class="listitem">
- <p>&#23427;&#20204;&#21487;&#20197;&#29992;&#20110;&#20840;&#26032;&#23433;&#35013;&#65292;&#25110;&#26356;&#26032;&#20043;&#21069;&#30340;&#29256;&#26412;&#12290;</p>
+ <p>They are used for performing clean installs or to upgrade a previously
+ installed version of Mageia
+ </p>
</li>
<li class="listitem">
- <p>&#23186;&#20171;&#26377; 32 &#20301;&#21644; 64 &#20301;&#20004;&#31181;&#26550;&#26500;&#20043;&#20998;&#12290;</p>
+ <p>Different media for 32 and 64-bit architectures</p>
</li>
<li class="listitem">
- <p>&#27426;&#36814;&#23631;&#24149;&#20013;&#21015;&#20986;&#20102;&#19968;&#20123;&#21487;&#29992;&#30340;&#24037;&#20855;&#65292;&#22914;&#65306;&#25937;&#25588;&#31995;&#32479;&#12289;&#20869;&#23384;&#27979;&#35797;&#12289;&#30828;&#20214;&#26816;&#27979;&#24037;&#20855;&#12290;</p>
+ <p>Some tools are available in the Installer <span class="quote">&#8220;<span class="quote">Welcome</span>&#8221;</span> screen:
+ <span class="emphasis"><em>Rescue System, Memory Test, </em></span>and <span class="emphasis"><em>Hardware
+ Detection Tool</em></span></p>
</li>
<li class="listitem">
- <p>&#27599;&#20010; DVD &#20013;&#21253;&#21547;&#22810;&#31181;&#26700;&#38754;&#29615;&#22659;&#21644;&#35821;&#35328;&#25903;&#25345;&#12290;</p>
+ <p>Each DVD contains many available desktop environments and languages</p>
</li>
<li class="listitem">
- <p>&#24744;&#21487;&#20197;&#22312;&#23433;&#35013;&#26102;&#28155;&#21152;&#38750;&#33258;&#30001;&#36719;&#20214;&#12290;</p>
+ <p>You'll be given the choice during the installation to add non-free software</p>
</li>
</ul>
@@ -153,7 +228,7 @@
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="d5e53"></a>Live &#23186;&#20171;
+ <h4 class="title"><a name="d5e68"></a>Live &#23186;&#20171;
</h4>
</div>
</div>
@@ -164,7 +239,7 @@
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e55"></a>&#36890;&#29992;&#29305;&#24615;
+ <h5 class="title"><a name="d5e70"></a>&#36890;&#29992;&#29305;&#24615;
</h5>
</div>
</div>
@@ -175,27 +250,29 @@
<ul class="itemizedlist">
<li class="listitem">
- <p>&#21487;&#20197;&#29992;&#20110;&#39044;&#35272;&#35813;&#21457;&#34892;&#29256;&#65292;&#32780;&#26080;&#38656;&#23558;&#20854;&#23433;&#35013;&#21040;&#30828;&#30424;&#19978;&#12290;&#20063;&#21487;&#20197;&#29992;&#20110;&#23433;&#35013; Mageia &#33267;&#30828;&#30424;&#12290;</p>
+ <p>Can be used to preview the Mageia operating system without having to install
+ it
+ </p>
</li>
<li class="listitem">
- <p>&#27599;&#20010; ISO &#20165;&#21253;&#21547;&#19968;&#31181;&#26700;&#38754;&#29615;&#22659;&#65288;KDE Plasma&#12289;GNOME &#25110; Xfce&#65289;&#12290;</p>
+ <p>The Live media also includes an Installer.</p>
</li>
<li class="listitem">
- <p>&#23186;&#20171;&#26377; 32 &#20301;&#21644; 64 &#20301;&#20004;&#31181;&#26550;&#26500;&#20043;&#20998;&#12290;</p>
+ <p>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)</p>
</li>
<li class="listitem">
- <p><span class="bold"><strong>Live ISO &#20165;&#33021;&#29992;&#20110;&#20840;&#26032;&#23433;&#35013;&#65292;&#32780;&#26080;&#27861;&#23545;&#20043;&#21069;&#30340;&#29256;&#26412;&#36827;&#34892;&#21319;&#32423;&#12290;</strong></span></p>
+ <p>Different media for 32 and 64-bit architectures</p>
</li>
<li class="listitem">
- <p>&#20854;&#20013;&#21253;&#21547;&#38750;&#33258;&#30001;&#36719;&#20214;&#12290;</p>
+ <p>They contain non-free software</p>
</li>
</ul>
@@ -207,7 +284,7 @@
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e69"></a>Live DVD KDE
+ <h5 class="title"><a name="d5e83"></a>Live DVD KDE
</h5>
</div>
</div>
@@ -218,17 +295,17 @@
<ul class="itemizedlist">
<li class="listitem">
- <p>&#20165;&#21253;&#21547; KDE&#65288;Plasma&#65289;&#26700;&#38754;&#29615;&#22659;&#12290;</p>
+ <p>Plasma desktop environment only</p>
</li>
<li class="listitem">
- <p>&#21253;&#21547;&#25152;&#26377;&#35821;&#35328;&#25903;&#25345;&#12290;</p>
+ <p>All available languages are present</p>
</li>
<li class="listitem">
- <p>&#20165;&#25903;&#25345; 64 &#20301;&#22788;&#29702;&#22120;&#12290;</p>
+ <p>64-bit architecture only</p>
</li>
</ul>
@@ -240,7 +317,7 @@
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e78"></a>Live DVD GNOME
+ <h5 class="title"><a name="d5e92"></a>Live DVD GNOME
</h5>
</div>
</div>
@@ -251,17 +328,17 @@
<ul class="itemizedlist">
<li class="listitem">
- <p>&#20165;&#21253;&#21547; GNOME &#26700;&#38754;&#29615;&#22659;&#12290;</p>
+ <p>GNOME desktop environment only</p>
</li>
<li class="listitem">
- <p>&#21253;&#21547;&#25152;&#26377;&#35821;&#35328;&#25903;&#25345;&#12290;</p>
+ <p>All available languages are present</p>
</li>
<li class="listitem">
- <p>&#20165;&#25903;&#25345; 64 &#20301;&#22788;&#29702;&#22120;</p>
+ <p>64-bit architecture only</p>
</li>
</ul>
@@ -273,7 +350,7 @@
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e87"></a>Live DVD Xfce
+ <h5 class="title"><a name="d5e101"></a>Live DVD Xfce
</h5>
</div>
</div>
@@ -284,17 +361,17 @@
<ul class="itemizedlist">
<li class="listitem">
- <p>&#20165;&#21253;&#21547; Xfce &#26700;&#38754;&#29615;&#22659;&#12290;</p>
+ <p>Xfce desktop environment only</p>
</li>
<li class="listitem">
- <p>&#21253;&#21547;&#25152;&#26377;&#35821;&#35328;&#25903;&#25345;&#12290;</p>
+ <p>All available languages are present</p>
</li>
<li class="listitem">
- <p>&#21516;&#26102;&#25903;&#25345; 32 &#20301;&#21644; 64 &#20301;&#22788;&#29702;&#22120;&#12290;</p>
+ <p>32 or 64-bit architectures</p>
</li>
</ul>
@@ -304,11 +381,11 @@
</div>
- <div class="section" title="&#20165;&#29992;&#20110;&#24341;&#23548;&#30340; CD">
+ <div class="section" title="Net install media">
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="d5e96"></a>&#20165;&#29992;&#20110;&#24341;&#23548;&#30340; CD
+ <h4 class="title"><a name="d5e110"></a>Net install media
</h4>
</div>
</div>
@@ -319,7 +396,7 @@
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e98"></a>&#36890;&#29992;&#29305;&#24615;
+ <h5 class="title"><a name="d5e112"></a>&#36890;&#29992;&#29305;&#24615;
</h5>
</div>
</div>
@@ -330,24 +407,12 @@
<ul class="itemizedlist">
<li class="listitem">
- <p>&#27492;&#31867;&#23186;&#20171;&#20165;&#21253;&#21547;&#21551;&#21160; drakx &#23433;&#35013;&#22120;&#21644;&#26597;&#25214; drakx-installer-stage2
- &#31561;&#36719;&#20214;&#21253;&#25152;&#24517;&#39035;&#30340;&#31243;&#24207;&#65292;&#22240;&#27492;&#38750;&#24120;&#36731;&#24039;&#12290;&#29992;&#20110;&#21518;&#32493;&#23433;&#35013;&#30340;&#36719;&#20214;&#21253;&#21487;&#20197;&#20301;&#20110;&#30005;&#33041;&#30828;&#30424;&#12289;&#26412;&#22320;&#39537;&#21160;&#22120;&#12289;&#26412;&#22320;&#32593;&#32476;&#25110;&#20114;&#32852;&#32593;&#12290;
- </p>
+ <p>Different media for 32 and 64-bit architectures</p>
</li>
<li class="listitem">
- <p>&#36825;&#31867;&#23186;&#20171;&#38750;&#24120;&#23567;&#24039;&#65288;&#23567;&#20110; 100 MB&#65289;&#65292;&#36866;&#29992;&#20110;&#19981;&#26041;&#20415;&#19979;&#36733;&#23436;&#25972;&#29256; DVD&#12289;&#27809;&#26377; DVD &#39537;&#21160;&#22120;&#25110;&#19981;&#25903;&#25345; USB &#24341;&#23548;&#30340;&#30005;&#33041;&#12290;</p>
-
- </li>
- <li class="listitem">
-
- <p>&#23186;&#20171;&#26377; 32 &#20301;&#21644; 64 &#20301;&#20004;&#31181;&#26550;&#26500;&#20043;&#20998;&#12290;</p>
-
- </li>
- <li class="listitem">
-
- <p>&#20165;&#21253;&#21547;&#33521;&#35821;&#25903;&#25345;&#12290;</p>
+ <p>First steps are English language only</p>
</li>
</ul>
@@ -359,7 +424,7 @@
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e109"></a>netinstall.iso
+ <h5 class="title"><a name="d5e119"></a>netinstall.iso
</h5>
</div>
</div>
@@ -370,7 +435,9 @@
<ul class="itemizedlist">
<li class="listitem">
- <p>&#20165;&#21253;&#21547;&#33258;&#30001;&#36719;&#20214;&#65292;&#36866;&#29992;&#20110;&#19981;&#24076;&#26395;&#20351;&#29992;&#38750;&#33258;&#30001;&#36719;&#20214;&#30340;&#20154;&#12290;</p>
+ <p>Contains only free software, for those who prefer to not use non-free
+ software
+ </p>
</li>
</ul>
@@ -382,7 +449,7 @@
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e114"></a>netinstall-nonfree.iso
+ <h5 class="title"><a name="d5e124"></a>netinstall-nonfree.iso
</h5>
</div>
</div>
@@ -393,7 +460,7 @@
<ul class="itemizedlist">
<li class="listitem">
- <p>&#21253;&#21547;&#37096;&#20998;&#29992;&#25143;&#25152;&#38656;&#30340;&#38750;&#33258;&#30001;&#36719;&#20214;&#65288;&#20027;&#35201;&#20026;&#39537;&#21160;&#12289;&#32534;&#30721;&#22120;&#65289;&#12290;</p>
+ <p>Contains non-free software (mostly drivers, codecs...) for those who need it</p>
</li>
</ul>
@@ -409,7 +476,7 @@
<div class="titlepage">
<div>
<div>
- <h3 class="title"><a name="d5e119"></a>&#19979;&#36733;&#21644;&#26816;&#26597;&#23186;&#20171;
+ <h3 class="title"><a name="d5e129"></a>&#19979;&#36733;&#21644;&#26816;&#26597;&#23186;&#20171;
</h3>
</div>
</div>
@@ -420,23 +487,35 @@
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="d5e121"></a>&#19979;&#36733;&#20013;
+ <h4 class="title"><a name="d5e131"></a>&#19979;&#36733;&#20013;
</h4>
</div>
</div>
</div>
- <p>&#22312;&#36873;&#25321;&#20102; ISO &#25991;&#20214;&#21518;&#65292;&#24744;&#21487;&#20197;&#36890;&#36807; HTTP &#25110; BitTorrent
- &#19979;&#36733;&#23427;&#12290;&#30456;&#24212;&#30340;&#31383;&#21475;&#20013;&#23558;&#20250;&#25552;&#31034;&#24744;&#27491;&#22312;&#20351;&#29992;&#30340;&#38236;&#20687;&#28304;&#65292;&#24182;&#22312;&#36895;&#24230;&#22826;&#24930;&#26102;&#25552;&#37266;&#24744;&#26356;&#25442;&#38236;&#20687;&#28304;&#12290;&#33509;&#24744;&#20351;&#29992; HTTP &#26041;&#24335;&#19979;&#36733;&#65292;&#24744;&#21487;&#33021;&#20250;&#30475;&#21040;&#31867;&#20284;&#19979;&#21015;&#24773;&#24418;
+ <p>Once you have chosen your ISO file, you can download it using either http or
+ BitTorrent. In both cases, you are provided with some information, such as
+ the mirror in use and an option to switch to an alternative if the bandwidth
+ is too low.
</p>
+ <p>If http is chosen you will also see some information regarding checksums.</p>
+
- <p>md5sum &#21644; sha1sum &#26159;&#29992;&#20110;&#26816;&#26597; ISO &#25991;&#20214;&#23436;&#25972;&#24615;&#30340;&#24037;&#20855;&#65292;&#21482;&#38656;&#20351;&#29992;&#20854;&#20013;&#19968;&#31181;&#21363;&#21487;&#12290;&#35831;&#24744;&#20445;&#30041;&#23427;&#20204;&#20197;&#20415;<a class="link" href="Select-and-use-ISOs.html#integrity">&#21518;&#32493;&#20351;&#29992;</a>&#12290;&#20043;&#21518;&#65292;&#31383;&#21475;&#23558;&#20250;&#26174;&#31034;&#65306;
+ <p><code class="literal">md5sum</code>, <code class="literal">sha1sum</code> and
+ <code class="literal">sha512sum</code> (the most secure) are tools to check the ISO
+ integrity. Copy one of the checksums (string of alphanumeric characters) for
+ use in the next section.
</p>
+
+
+ <p>In the meantime, a window to download the actual ISO will open:</p>
+
- <p>&#28857;&#20987;&#8220;&#20445;&#23384;&#25991;&#20214;&#8221;&#36873;&#39033;&#12290;</p>
+ <p>Click on <span class="emphasis"><em>Save File</em></span>, then click <span class="emphasis"><em>OK</em></span>.
+ </p>
</div>
@@ -444,31 +523,55 @@
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="d5e133"></a>&#26816;&#26597;&#19979;&#36733;&#25991;&#20214;&#30340;&#23436;&#25972;&#24615;
+ <h4 class="title"><a name="d5e149"></a>&#26816;&#26597;&#19979;&#36733;&#25991;&#20214;&#30340;&#23436;&#25972;&#24615;
</h4>
</div>
</div>
</div>
- <p>&#36825;&#20004;&#31181;&#26657;&#39564;&#21644;&#22343;&#30001;&#29305;&#23450;&#31639;&#27861;&#35745;&#31639;&#25991;&#20214;&#20869;&#23481;&#20135;&#29983;&#65292;&#19988;&#22343;&#20026;&#21313;&#20845;&#36827;&#21046;&#25968;&#23383;&#12290;&#24403;&#24744;&#20351;&#29992;&#36825;&#20123;&#31639;&#27861;&#26469;&#37325;&#26032;&#35745;&#31639;&#19979;&#36733;&#25991;&#20214;&#30340;&#26657;&#39564;&#20540;&#26102;&#65292;&#22914;&#26524;&#24744;&#24471;&#21040;&#30340;&#32467;&#26524;&#21644; Mageia
- &#25552;&#20379;&#30340;&#19968;&#33268;&#65292;&#35828;&#26126;&#24744;&#30340;&#25991;&#20214;&#27809;&#26377;&#38382;&#39064;&#65307;&#21542;&#21017;&#65292;&#35828;&#26126;&#19979;&#36733;&#22833;&#36133;&#65292;&#24744;&#21487;&#33021;&#38656;&#35201;&#37325;&#26032;&#19979;&#36733;&#65292;&#25110;&#25913;&#29992; BitTorrent &#19979;&#36733;&#12290;
+ <p>The checksums referred to earlier, are digital fingerprints generated by an
+ algorithm from the file to be downloaded. You may compare the checksum of
+ your downloaded ISO against that of the original source ISO. If the
+ checksums do not match, it means that the actual data on the ISO's do not
+ match, and if that is the case, then you should retry the download or
+ attempt a repair using BitTorrent.
</p>
- <p>&#25171;&#24320;&#19968;&#20010;&#32456;&#31471;&#65288;&#26080;&#38656;&#20197; root &#36523;&#20221;&#25805;&#20316;&#65289;&#65292;&#28982;&#21518;&#65306;</p>
-
- <p>- &#33509;&#20351;&#29992; md5sum&#65292;&#35831;&#36755;&#20837;&#65306;[sam@localhost]$ <strong class="userinput"><code>md5sum
- path/to/the/image/file.iso</code></strong>&#12290;
+ <p>To generate the checksum for your downloaded ISO, open a console, (no need
+ to be root), and:
</p>
- <p>- &#33509;&#20351;&#29992; sha1sum&#65292;&#35831;&#36755;&#20837;&#65306;[sam@localhost]$ <strong class="userinput"><code>sha1sum
- path/to/the/image/file.iso</code></strong>&#12290;
- </p>
+ <div class="itemizedlist">
+ <ul class="itemizedlist">
+ <li class="listitem">
+
+ <p>To use the md5sum, type: <span class="command"><strong>md5sum
+ path/to/the/image/file.iso</strong></span></p>
+
+ </li>
+ <li class="listitem">
+
+ <p>To use the sha1sum, type: <span class="command"><strong>sha1sum
+ path/to/the/image/file.iso</strong></span></p>
+
+ </li>
+ <li class="listitem">
+
+ <p>To use the sha512sum, type: <span class="command"><strong>sha512sum
+ path/to/the/image/file.iso</strong></span></p>
+
+ </li>
+ </ul>
+ </div>
- <p>&#28982;&#21518;&#27604;&#36739;&#25191;&#34892;&#32467;&#26524;&#65288;&#21487;&#33021;&#38656;&#35201;&#31561;&#24453;&#19968;&#27573;&#26102;&#38388;&#65289;&#21644; Mageia &#32593;&#19978;&#25552;&#20379;&#30340;&#25968;&#20540;&#12290;&#20363;&#22914;&#65306;</p>
+ <p>Example:</p>
+
- <p></p>
+ <p>then compare the result (you may have to wait for a while) with the ISO
+ checksum provided by Mageia.
+ </p>
</div>
@@ -478,28 +581,33 @@
<div class="titlepage">
<div>
<div>
- <h3 class="title"><a name="d5e146"></a>&#21051;&#24405;&#25110;&#36716;&#20648; ISO
+ <h3 class="title"><a name="d5e168"></a>&#21051;&#24405;&#25110;&#36716;&#20648; ISO
</h3>
</div>
</div>
</div>
- <p>&#32463;&#36807;&#26816;&#26597;&#21518;&#30340; ISO &#21363;&#21487;&#34987;&#21051;&#24405;&#33267; CD/DVD&#65292;&#25110;&#20889;&#20837;&#21040; U &#30424;&#12290;&#36825;&#20123;&#25805;&#20316;&#19981;&#21516;&#20110;&#31616;&#21333;&#30340;&#22797;&#21046;&#65292;&#20854;&#30446;&#30340;&#26159;&#21019;&#24314;&#19968;&#20010;&#21487;&#24341;&#23548;&#30340;&#23186;&#20307;&#12290;</p>
+ <p>The verified ISO can now be burned to a CD/DVD or <span class="quote">&#8220;<span class="quote">dumped</span>&#8221;</span> to a
+ USB stick. This is not a standard copy operation, as a bootable medium will
+ actually be created.
+ </p>
<div class="section" title="&#23558;ISO&#25991;&#20214;&#21051;&#24405;&#21040;CD&#25110;DVD">
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="d5e149"></a>&#23558;ISO&#25991;&#20214;&#21051;&#24405;&#21040;CD&#25110;DVD
+ <h4 class="title"><a name="d5e172"></a>&#23558;ISO&#25991;&#20214;&#21051;&#24405;&#21040;CD&#25110;DVD
</h4>
</div>
</div>
</div>
- <p>&#24744;&#21487;&#20197;&#21051;&#24405;&#20219;&#20309;&#25152;&#38656;&#38236;&#20687;&#65292;&#20294;&#35831;&#30830;&#20445;&#21051;&#24405;&#35774;&#22791;&#30340;&#27169;&#24335;&#34987;&#35774;&#20026;<span class="bold"><strong>&#21051;&#24405;&#38236;&#20687;</strong></span>&#65292;&#32780;&#38750;&#21051;&#24405;&#25968;&#25454;&#25110;&#25991;&#20214;&#12290;&#26356;&#22810;&#20449;&#24687;&#35831;&#35265; <a class="ulink" href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images" target="_top">Mageia
- wiki</a>&#12290;
+ <p>Whichever software you use, ensure that the option to burn an<span class="emphasis"><em>
+ image</em></span> is used. Burn <span class="emphasis"><em>data</em></span> or
+ <span class="emphasis"><em>files</em></span> is NOT correct. See the <a class="ulink" href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images" target="_top">the Mageia
+ wiki</a> for more information.
</p>
</div>
@@ -508,14 +616,16 @@
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="d5e154"></a>&#20889;&#20837; ISO &#21040; U &#30424;
+ <h4 class="title"><a name="d5e179"></a>&#20889;&#20837; ISO &#21040; U &#30424;
</h4>
</div>
</div>
</div>
- <p>&#25152;&#26377;&#30340; Mageia ISO &#22343;&#20026;&#28151;&#21512;&#31867;&#22411; ISO&#65292;&#22240;&#27492;&#24744;&#21487;&#20197;&#23558;&#20854;&#8220;&#36716;&#20648;&#8221;&#21040; U &#30424;&#20013;&#65292;&#28982;&#21518;&#20351;&#29992; U &#30424;&#26469;&#24341;&#23548;&#21644;&#23433;&#35013;&#31995;&#32479;&#12290;</p>
+ <p>All Mageia ISOs are hybrids, which means you can dump them to a USB stick
+ and then use that to boot and install the system.
+ </p>
<div class="warning" title="&#35686;&#21578;" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Warning">
@@ -526,20 +636,44 @@
<tr>
<td align="left" valign="top">
- <p>&#8220;&#36716;&#20648;&#8221;&#38236;&#20687;&#33267;&#38378;&#23384;&#35774;&#22791;&#23558;&#20250;&#30772;&#22351;&#35774;&#22791;&#19978;&#21407;&#20808;&#30340;&#25991;&#20214;&#31995;&#32479;&#65292;&#20219;&#20309;&#25968;&#25454;&#37117;&#23558;&#20002;&#22833;&#65292;&#24182;&#19988;&#20998;&#21306;&#23481;&#37327;&#23558;&#20250;&#65288;&#26242;&#26102;&#65289;&#32553;&#20943;&#20026;&#38236;&#20687;&#22823;&#23567;&#12290;</p>
+ <p>Dumping an image onto a flash device destroys any previous file-system on
+ the device and all existing data will be lost.
+ </p>
</td>
</tr>
</table>
</div>
- <p>&#33509;&#35201;&#24674;&#22797;&#21407;&#22987;&#23481;&#37327;&#65292;&#24744;&#24517;&#39035;&#37325;&#26032;&#36827;&#34892;&#20998;&#21306;&#21644;&#26684;&#24335;&#21270;&#25805;&#20316;&#12290;</p>
+ <div class="note" title="&#27880;&#24847;" style="margin-left: 0.5in; margin-right: 0.5in;">
+ <table border="0" summary="Note">
+ <tr>
+ <td rowspan="2" align="center" valign="top" width="25"><img alt="[&#27880;&#24847;]" src="note.png"></td>
+ <th align="left"></th>
+ </tr>
+ <tr>
+ <td align="left" valign="top">
+
+ <p>Also, the only partition on the flash device will then just be the Mageia
+ ISO partition.
+ </p>
+
+ <p>So, if an ISO of about 4GB is written to an 8GB USB stick, the stick will
+ then only show up as 4GB. This is because the remaining 4GB is no longer
+ formatted - hence not currently available for use. To recover the original
+ capacity, you must reformat and repartition the USB stick.
+ </p>
+
+ </td>
+ </tr>
+ </table>
+ </div>
<div class="section" title="&#20351;&#29992; Mageia &#30340;&#22270;&#24418;&#21270;&#24037;&#20855;">
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e160"></a>&#20351;&#29992; Mageia &#30340;&#22270;&#24418;&#21270;&#24037;&#20855;
+ <h5 class="title"><a name="d5e187"></a>&#20351;&#29992; Mageia &#30340;&#22270;&#24418;&#21270;&#24037;&#20855;
</h5>
</div>
</div>
@@ -556,7 +690,7 @@
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e164"></a>&#20351;&#29992; Windows &#19979;&#30340;&#22270;&#24418;&#21270;&#24037;&#20855;
+ <h5 class="title"><a name="d5e191"></a>&#20351;&#29992; Windows &#19979;&#30340;&#22270;&#24418;&#21270;&#24037;&#20855;
</h5>
</div>
</div>
@@ -565,20 +699,31 @@
<p>&#24744;&#21487;&#20197;&#23581;&#35797;&#65306;</p>
- <p>- <a class="ulink" href="http://rufus.akeo.ie/?locale=en_US" target="_top">Rufus</a> &#20013;&#30340;&#8220;ISO
- &#38236;&#20687;&#8221;&#36873;&#39033;&#65307;
- </p>
-
- <p>- <a class="ulink" href="http://sourceforge.net/projects/win32diskimager" target="_top">Win32
- Disk Imager</a></p>
+ <div class="itemizedlist">
+ <ul class="itemizedlist">
+ <li class="listitem">
+
+ <p><a class="ulink" href="http://rufus.akeo.ie/?locale=en_US" target="_top">Rufus</a> using the
+ "ISO image" option
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p><a class="ulink" href="http://sourceforge.net/projects/win32diskimager" target="_top">Win32 Disk
+ Imager</a></p>
+
+ </li>
+ </ul>
+ </div>
</div>
- <div class="section" title="&#20351;&#29992; GNU/Linux &#31995;&#32479;&#20013;&#30340;&#21629;&#20196;&#34892;&#31243;&#24207;">
+ <div class="section" title="Using the Command line within a GNU/Linux system">
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e171"></a>&#20351;&#29992; GNU/Linux &#31995;&#32479;&#20013;&#30340;&#21629;&#20196;&#34892;&#31243;&#24207;
+ <h5 class="title"><a name="d5e201"></a>Using the Command line within a GNU/Linux system
</h5>
</div>
</div>
@@ -594,15 +739,15 @@
<tr>
<td align="left" valign="top">
- <p>&#25163;&#21160;&#36827;&#34892;&#27492;&#25805;&#20316;&#26377;&#28508;&#22312; *&#21361;&#38505;*&#12290;&#22914;&#26524;&#24744;&#24324;&#38169;&#20102;&#35774;&#22791; ID&#65292;&#21487;&#33021;&#20250;&#35206;&#30422;&#25481;&#20854;&#20182;&#20998;&#21306;&#20013;&#30340;&#25968;&#25454;&#12290;</p>
+ <p>It is potentially *dangerous* to do this by hand. You risk overwriting
+ potentially valuable existing data if you specify the wrong target device.
+ </p>
</td>
</tr>
</table>
</div>
- <p>&#24744;&#20063;&#21487;&#20197;&#22312;&#32456;&#31471;&#20013;&#20351;&#29992; dd &#24037;&#20855;&#65306;</p>
-
<div class="orderedlist">
<ol class="orderedlist" type="1">
<li class="listitem">
@@ -612,23 +757,37 @@
</li>
<li class="listitem">
- <p>&#20351;&#29992;&#21629;&#20196; <strong class="userinput"><code>su -</code></strong> &#33719;&#21462; root &#26435;&#38480;&#65288;&#19981;&#35201;&#28431;&#25481;&#26411;&#23614;&#30340;&#8220;-&#8221;&#65289;
+ <p>Become a <span class="emphasis"><em>root</em></span> (Administrator) user with the command
+ <span class="command"><strong>su -</strong></span> (don't forget the <span class="command"><strong>-</strong></span> )
</p>
</li>
<li class="listitem">
- <p>&#25554;&#20837;&#24744;&#30340; U &#30424;&#65288;&#26080;&#38656;&#25346;&#36733;&#65292;&#24182;&#19988;&#19981;&#35201;&#29992;&#20219;&#20309;&#24212;&#29992;&#31243;&#24207;&#25110;&#25991;&#20214;&#31649;&#29702;&#22120;&#35775;&#38382;&#23427;&#65289;</p>
+ <p>Plug in your USB stick - but do not mount it (this also means do not open
+ any application or file manager that could access or read it)
+ </p>
</li>
<li class="listitem">
- <p>&#36755;&#20837;&#21629;&#20196; <strong class="userinput"><code>fdisk -l</code></strong></p>
+ <p>Enter the command <span class="command"><strong>fdisk -l</strong></span></p>
+
+ </li>
+ <li class="listitem">
- <p>&#25110;&#32773;&#65292;&#24744;&#20063;&#21487;&#20197;&#36890;&#36807;&#21629;&#20196; <code class="code">dmesg</code> &#26469;&#26597;&#30475;&#35774;&#22791;&#21517;&#65306;&#22312;&#36755;&#20837;&#26411;&#23614;&#65292;&#24744;&#23558;&#30475;&#21040;&#20197; <span class="emphasis"><em>sd</em></span>
- &#24320;&#22836;&#30340;&#35774;&#22791;&#21517;&#65292;&#22914; <span class="emphasis"><em>sdd</em></span></p>
+ <p>Find the device name for your USB stick (by its size), for example
+ <code class="filename">/dev/sdb</code> in the screenshot above, is an 8GB USB stick.
+ </p>
+
+ <p>Alternatively, you can find the device name with the command
+ <span class="command"><strong>dmesg</strong></span>. Towards the end of the following example, you can
+ see the device name starting with <code class="filename">sd</code>, and in this case,
+ <code class="filename">sdd</code> is the actual device. You can also see that its
+ size is 2GB:
+ </p>
<pre class="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
@@ -650,28 +809,43 @@
</li>
<li class="listitem">
- <p>&#36890;&#36807;&#30913;&#30424;&#22823;&#23567;&#26469;&#30830;&#35748;&#24744;&#30340; U &#30424;&#30340;&#35774;&#22791;&#21517;&#65292;&#20363;&#22914;&#22270;&#20013;&#25152;&#31034;&#30340; <code class="code">/dev/sdb</code>&#65292;&#26159;&#19968;&#20010; 8GB &#30340; U &#30424;&#12290;
- </p>
-
- </li>
- <li class="listitem">
+ <p>Enter the command: <span class="command"><strong>dd if=path/to/the/ISO/file
+ of=/dev/sd<em class="replaceable"><code>X</code></em> bs=1M</strong></span></p>
- <p>&#36755;&#20837;&#21629;&#20196;&#65306;# <strong class="userinput"><code>dd if=ISO&#25991;&#20214;&#30340;&#23436;&#25972;&#36335;&#24452; of=/dev/sdX bs=1M</code></strong></p>
+ <p>Where <em class="replaceable"><code>X</code></em>=your device name eg:
+ <code class="filename">/dev/sdd</code></p>
- <p>&#20854;&#20013;&#65292;&#8220;X&#8221;&#26159;&#24744;&#30340;&#35774;&#22791;&#21517;&#65288;&#22914;&#65306;/dev/sdc&#65289;</p>
+ <p>Example:<code class="literal"> dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
+ of=/dev/sdd bs=1M</code></p>
- <p>&#31034;&#20363;&#65306;# <strong class="userinput"><code>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
- of=/dev/sdb bs=1M</code></strong></p>
+ <div class="tip" title="&#25552;&#31034;" style="margin-left: 0.5in; margin-right: 0.5in;">
+ <table border="0" summary="Tip">
+ <tr>
+ <td rowspan="2" align="center" valign="top" width="25"><img alt="[&#25552;&#31034;]" src="tip.png"></td>
+ <th align="left"></th>
+ </tr>
+ <tr>
+ <td align="left" valign="top">
+
+ <p>It might be helpful to know that <span class="bold"><strong>if</strong></span> stands
+ for <span class="bold"><strong>i</strong></span>nput <span class="bold"><strong>f</strong></span>ile and <span class="bold"><strong>of</strong></span> stands
+ for <span class="bold"><strong>o</strong></span>utput <span class="bold"><strong>f</strong></span>ile
+ </p>
+
+ </td>
+ </tr>
+ </table>
+ </div>
</li>
<li class="listitem">
- <p>&#36755;&#20837;&#21629;&#20196;&#65306;# <strong class="userinput"><code>sync</code></strong></p>
+ <p>Enter the command: <span class="command"><strong>sync</strong></span></p>
</li>
<li class="listitem">
- <p>&#25805;&#20316;&#23436;&#25104;&#65292;&#25300;&#19979; U &#30424;</p>
+ <p>This is the end of the process, and you may now unplug your USB stick.</p>
</li>
</ol>
diff --git a/zh_cn/acceptLicense.html b/zh_cn/acceptLicense.html
index 7b8e20d..ccae3e1 100644
--- a/zh_cn/acceptLicense.html
+++ b/zh_cn/acceptLicense.html
@@ -38,6 +38,12 @@
+
+
+
+
+
+
@@ -57,19 +63,35 @@
- <p>&#22312;&#23433;&#35013; <span class="application">Mageia</span> &#20043;&#21069;&#65292;&#35831;&#20808;&#20180;&#32454;&#38405;&#35835;&#35768;&#21487;&#26465;&#27454;&#21644;&#35768;&#21487;&#26465;&#20214;&#12290;
- </p>
-
-
- <p>&#36825;&#20123;&#35768;&#21487;&#26465;&#27454;&#21644;&#35768;&#21487;&#26465;&#20214;&#36866;&#29992;&#20110;&#25972;&#20010; <span class="application">Mageia</span> &#21457;&#34892;&#29256;&#65292;&#20320;&#24517;&#39035;&#20104;&#20197;&#25509;&#21463;&#25165;&#33021;&#32487;&#32493;&#23433;&#35013;&#12290;
- </p>
-
-
- <p>&#35201;&#25509;&#21463;, &#21482;&#35201;&#36873;&#25321; <span class="guilabel">&#25509;&#21463;</span> &#21518;&#28857;&#20987; <span class="guibutton">&#19979;&#19968;&#27493;</span>.
- </p>
+ <div class="itemizedlist">
+ <ul class="itemizedlist">
+ <li class="listitem">
+
+ <p>Before installing Mageia, please read the license terms and conditions
+ carefully.
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p>These terms and conditions apply to the entire Mageia distribution and must
+ be accepted before you can continue.
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p>To proceed, simply select <span class="emphasis"><em>Accept</em></span> and then click on
+ <span class="emphasis"><em>Next</em></span></p>
+
+ </li>
+ </ul>
+ </div>
- <p>&#33509;&#20320;&#19981;&#24076;&#26395;&#25509;&#21463;&#36825;&#20123;&#26465;&#20214;&#65292;&#25105;&#20204;&#21521;&#24744;&#34920;&#31034;&#35802;&#25370;&#27465;&#24847;&#12290;&#35831;&#28857;&#20987; <span class="guibutton">&#36864;&#20986;</span> &#26469;&#37325;&#21551;&#35745;&#31639;&#26426;&#12290;
+ <p>If you decide not to accept these conditions, then we thank you for your
+ interest in Mageia. Clicking <span class="emphasis"><em>Quit</em></span> will reboot your
+ computer.
</p>
@@ -93,7 +115,8 @@
- <p>&#26377;&#20851;&#27492; Mageia &#21457;&#24067;&#29256;&#26412;&#30340;&#37325;&#35201;&#20449;&#24687;&#65292;&#21487;&#20197;&#36890;&#36807;&#28857;&#20987; <span class="guibutton">&#21457;&#34892;&#35828;&#26126;</span> &#26469;&#38405;&#35835;&#12290;
+ <p>Important information about this particular Mageia release can be viewed by
+ clicking on the <span class="emphasis"><em>Release Notes</em></span> button.
</p>
</div>
diff --git a/zh_cn/addUser.html b/zh_cn/addUser.html
index 1c35ddc..0c27e51 100644
--- a/zh_cn/addUser.html
+++ b/zh_cn/addUser.html
@@ -2,29 +2,40 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>&#29992;&#25143;&#21644;&#31649;&#29702;&#21592;&#31649;&#29702;</title>
+ <title>User Management</title>
<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
<link rel="home" href="index.html" title="&#29992; DrakX &#23433;&#35013;">
<link rel="up" href="index.html" title="&#29992; DrakX &#23433;&#35013;">
- <link rel="prev" href="choosePackagesTree.html" title="&#36873;&#25321;&#21333;&#20010;&#36719;&#20214;&#21253;">
- <link rel="next" href="configureX_chooser.html" title="&#26174;&#31034;&#21345;&#21644;&#26174;&#31034;&#22120;&#37197;&#32622;"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
+ <link rel="prev" href="software.html" title="Software">
+ <link rel="next" href="graphicalConfiguration.html" title="Graphical Configuration"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
<!--
body { font-family: sans-serif; font-size: 13px }
table { font-family: sans-serif; font-size: 13px }
--></style></head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
- <div lang="zh_CN" class="section" title="&#29992;&#25143;&#21644;&#31649;&#29702;&#21592;&#31649;&#29702;">
+ <div lang="zh_CN" class="section" title="User Management">
<div class="titlepage">
<div>
<div>
- <h2 class="title"><a name="addUser"></a>&#29992;&#25143;&#21644;&#31649;&#29702;&#21592;&#31649;&#29702;
+ <h2 class="title"><a name="addUser"></a>User Management
</h2>
</div>
</div>
</div>
+
+
+
+
+
+
+
+
+
+
+
<div class="section" title="&#35774;&#32622;&#31649;&#29702;&#21592;&#65288;root &#36134;&#25143;&#65289;&#23494;&#30721;&#65306;">
<div class="titlepage">
@@ -36,11 +47,17 @@
</div>
</div>
+
- <p>&#25105;&#20204;&#24314;&#35758;&#20219;&#20309;&#26102;&#20505;&#23433;&#35013; <span class="application">Mageia</span> &#37117;&#35774;&#32622;&#19968;&#20010;&#36229;&#32423;&#29992;&#25143;&#25110;&#31649;&#29702;&#21592;&#23494;&#30721;&#65288;Linux &#20013;&#19968;&#33324;&#21483;&#20570;
- root
- &#23494;&#30721;&#65289;&#12290;&#24403;&#20320;&#22312;&#39030;&#37096;&#36755;&#20837;&#26694;&#20013;&#36755;&#20837;&#23494;&#30721;&#26102;&#65292;&#30462;&#30340;&#39068;&#33394;&#23558;&#20250;&#20174;&#32418;&#33394;&#21464;&#20026;&#40644;&#33394;&#12289;&#32511;&#33394;&#65292;&#29992;&#20197;&#25351;&#31034;&#20320;&#25152;&#36755;&#20837;&#23494;&#30721;&#30340;&#24378;&#24230;&#12290;&#32511;&#33394;&#34920;&#31034;&#20320;&#30340;&#23494;&#30721;&#24378;&#24230;&#36739;&#39640;&#12290;&#20320;&#38656;&#35201;&#22312;&#19979;&#26041;&#36755;&#20837;&#26694;&#20013;&#20877;&#27425;&#36755;&#20837;&#30456;&#21516;&#30340;&#23494;&#30721;&#65292;&#20197;&#30830;&#20445;&#20320;&#20043;&#21069;&#30340;&#23494;&#30721;&#27809;&#26377;&#36755;&#38169;&#12290;
+ <p>It is advisable for all Mageia installations to set a
+ <code class="literal">superuser</code> (Administrator) password, usually called the
+ <span class="emphasis"><em>root </em></span>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.
</p>
+
<div class="note" title="&#27880;&#24847;" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Note">
@@ -51,7 +68,9 @@
<tr>
<td align="left" valign="top">
- <p>&#25152;&#26377;&#30340;&#23494;&#30721;&#37117;&#21306;&#20998;&#22823;&#23567;&#20889;&#12290;&#24314;&#35758;&#22312;&#23494;&#30721;&#20013;&#28151;&#21512;&#20351;&#29992;&#23383;&#27597;&#65288;&#22823;&#20889;&#21644;&#23567;&#20889;&#65289;&#12289;&#25968;&#23383;&#21644;&#20854;&#20182;&#23383;&#31526;&#12290;</p>
+ <p>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.
+ </p>
</td>
</tr>
@@ -59,6 +78,7 @@
</div>
</div>
+
<div class="section" title="&#36755;&#20837;&#29992;&#25143;&#21517;">
<div class="titlepage">
@@ -70,43 +90,60 @@
</div>
</div>
+
- <p>&#22312;&#36825;&#37324;&#28155;&#21152;&#19968;&#20010;&#29992;&#25143;&#12290;&#19968;&#20010;&#29992;&#25143;&#25317;&#26377;&#27604;&#36229;&#32423;&#31649;&#29702;&#21592;&#26356;&#23569;&#30340;&#26435;&#38480;&#65292;&#20294;&#26159;&#32593;&#19978;&#20914;&#28010;&#65292;&#20351;&#29992;&#21150;&#20844;&#36719;&#20214;&#25110;&#32773;&#29609;&#28216;&#25103;&#31561;&#26159;&#36275;&#22815;&#30340;&#12290;</p>
+ <p>Add a User here. A regular user has fewer privileges than the
+ <code class="literal">superuser</code> (root), but enough to use the Internet, office
+ applications or play games and anything else the average user might use a
+ computer for.
+ </p>
+
<div class="itemizedlist">
<ul class="itemizedlist">
<li class="listitem">
- <p><span class="guibutton">&#22270;&#26631;</span>&#65306;&#33509;&#28857;&#20987;&#27492;&#25353;&#38062;&#65292;&#21017;&#20250;&#25913;&#21464;&#29992;&#25143;&#22270;&#26631;&#12290;
- </p>
+ <p><span class="bold"><strong>Icon</strong></span></p>
+
+
+ <p>Click on this button if you want to change the user's icon</p>
</li>
<li class="listitem">
- <p><span class="guilabel">&#30495;&#23454;&#22995;&#21517;</span>&#65306;&#22312;&#25991;&#26412;&#26694;&#20013;&#36755;&#20837;&#29992;&#25143;&#30340;&#30495;&#21517;&#12290;
- </p>
+ <p><span class="bold"><strong>Real Name</strong></span></p>
+
+
+ <p>Insert the user's real name into this text box</p>
</li>
<li class="listitem">
- <p><span class="guilabel">&#30331;&#24405;&#21517;</span>&#65306;&#36755;&#20837;&#29992;&#25143;&#30340;&#30331;&#24405;&#21517;&#65292;&#25110;&#35753; drakx
- &#26681;&#25454;&#30495;&#23454;&#22995;&#21517;&#33258;&#21160;&#35774;&#32622;&#12290;<span class="emphasis"><em>&#30331;&#24405;&#21517;&#21306;&#20998;&#22823;&#23567;&#20889;&#12290;</em></span></p>
+ <p><span class="bold"><strong>Login Name</strong></span></p>
+
+
+ <p>Enter the user login name or let DrakX use a version of the user's real
+ name. <span class="bold"><strong>The login name is case-sensitive.</strong></span></p>
</li>
<li class="listitem">
- <p><span class="guilabel">&#23494;&#30721;</span>&#65306;&#22312;&#27492;&#25991;&#26412;&#26694;&#20013;&#36755;&#20837;&#29992;&#25143;&#23494;&#30721;&#12290;&#21518;&#38754;&#30340;&#30462;&#29260;&#22270;&#26631;&#23558;&#20250;&#25351;&#31034;&#23494;&#30721;&#24378;&#24230;&#12290;&#65288;&#21442;&#35265; <a class="xref" href="addUser.html#givePassword" title="&#27880;&#24847;">&#27880;&#24847;</a>&#65289;
+ <p><span class="bold"><strong>Password</strong></span></p>
+
+
+ <p>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 <a class="xref" href="addUser.html#givePassword" title="&#27880;&#24847;">&#27880;&#24847;</a>)
</p>
-
- </li>
- <li class="listitem">
+
- <p><span class="guilabel">&#23494;&#30721;&#65288;&#37325;&#22797;&#65289;</span>&#65306;&#20877;&#36755;&#20837;&#20381;&#27425;&#29992;&#25143;&#23494;&#30721;&#12290;drakx &#23558;&#20250;&#26816;&#26597;&#20004;&#27425;&#36755;&#20837;&#30340;&#23494;&#30721;&#26159;&#21542;&#19968;&#33268;&#12290;
+ <p><span class="bold"><strong>Password (again):</strong></span> Retype the user
+ password. DrakX will check that you have not mistyped the password.
</p>
</li>
</ul>
</div>
+
<div class="note" title="&#27880;&#24847;" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Note">
@@ -117,10 +154,16 @@
<tr>
<td align="left" valign="top">
- <p>&#22312;&#23433;&#35013; Mageia &#26399;&#38388;&#28155;&#21152;&#30340;&#20219;&#20309;&#29992;&#25143;&#37117;&#23558;&#25317;&#26377;&#35835;/&#20889;&#20445;&#25252;&#30340;&#20027;&#30446;&#24405;&#65288;&#21363; umask=0027&#65289;&#12290;</p>
+ <p>Any users added while installing Mageia, will have a home directory that is
+ both read and write protected (umask=0027)
+ </p>
+
- <p>&#20320;&#21487;&#20197;&#22312;<span class="emphasis"><em>&#37197;&#32622; - &#27010;&#35201;</em></span>&#19968;&#27493;&#20013;&#28155;&#21152;&#20854;&#20182;&#25152;&#38656;&#29992;&#25143;&#65292;&#21482;&#38656;&#36873;&#25321;<span class="emphasis"><em>&#29992;&#25143;&#31649;&#29702;</em></span>&#21363;&#21487;&#12290;
+ <p>You can add any extra needed users in the <span class="emphasis"><em>Configuration -
+ Summary</em></span> step during the install. Choose <span class="emphasis"><em>User
+ management</em></span>.
</p>
+
<p>&#20063;&#21487;&#20197;&#22312;&#23433;&#35013;&#23436;&#25104;&#21518;&#25913;&#21464;&#35775;&#38382;&#26435;&#38480;&#12290;</p>
@@ -130,65 +173,46 @@
</div>
</div>
+
- <div class="section" title="&#39640;&#32423;&#29992;&#25143;&#31649;&#29702;">
+ <div class="section" title="User Management (advanced)">
<div class="titlepage">
<div>
<div>
- <h3 class="title"><a name="addUserAdvanced"></a>&#39640;&#32423;&#29992;&#25143;&#31649;&#29702;
+ <h3 class="title"><a name="addUserAdvanced"></a>User Management (advanced)
</h3>
</div>
</div>
</div>
+
- <p>&#33509;&#28857;&#20987;<span class="guibutton">&#39640;&#32423;</span>&#25353;&#38062;&#65292;&#24744;&#21487;&#20197;&#22312;&#24377;&#20986;&#30340;&#31383;&#21475;&#20013;&#23545;&#25152;&#28155;&#21152;&#30340;&#29992;&#25143;&#36827;&#34892;&#35774;&#32622;&#12290;
+ <p>The <span class="emphasis"><em>Advanced</em></span> option allows you to edit further settings
+ for the user you are adding.
</p>
-
- <p>&#27492;&#22806;&#65292;&#24744;&#36824;&#21487;&#20197;&#31105;&#29992;&#25110;&#21551;&#29992;&#26469;&#23486;&#36134;&#25143;&#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>&#20219;&#20309;&#20351;&#29992;<span class="emphasis"><em>rbash</em></span>&#26469;&#23486;&#36134;&#25143;&#21019;&#24314;&#30340;&#25991;&#20214;&#23558;&#20250;&#22312;&#27880;&#38144;&#21518;&#34987;&#21024;&#38500;&#12290;&#26469;&#23486;&#24212;&#24403;&#23558;&#20182;/&#22905;&#30340;&#20020;&#26102;&#25991;&#20214;&#23384;&#20648;&#20110; U &#30424;&#31561;&#35774;&#22791;&#20013;&#12290;
- </p>
-
- </td>
- </tr>
- </table>
- </div>
+
<div class="itemizedlist">
<ul class="itemizedlist">
<li class="listitem">
- <p><span class="guilabel">&#21551;&#29992;&#26469;&#23486;&#36134;&#25143;</span>&#65306;&#36825;&#37324;&#24744;&#21487;&#20197;&#21551;&#29992;&#25110;&#31105;&#29992;&#26469;&#23486;&#36134;&#25143;&#12290;&#26469;&#23486;&#36134;&#25143;&#20801;&#35768;&#26469;&#23486;&#30331;&#24405;&#24182;&#20351;&#29992;&#30005;&#33041;&#65292;&#20294;&#23545;&#20854;&#20351;&#29992;&#26356;&#20005;&#26684;&#30340;&#35775;&#38382;&#26435;&#38480;&#25511;&#21046;&#12290;
- </p>
-
- </li>
- <li class="listitem">
-
- <p><span class="guilabel">Shell</span>&#65306;&#21487;&#20197;&#22312;&#19979;&#21015;&#21015;&#34920;&#20013;&#36873;&#25321;&#29992;&#25143;&#25152;&#20351;&#29992;&#30340; shell&#65288;&#22312;&#19978;&#19968;&#27493;&#20013;&#28155;&#21152;&#65289;&#65292;&#21487;&#33021;&#30340;&#36873;&#39033;&#26377; Bash&#12289;Dash
- &#21644; Sh&#12290;
- </p>
+ <p><span class="emphasis"><em>Shell</em></span>: This drop-down list allows you to change the
+ shell available to any user you added in the previous screen. Options are
+ <code class="literal">Bash</code>, <code class="literal">Dash</code> and <code class="literal">Sh</code></p>
</li>
<li class="listitem">
- <p><span class="guilabel">&#29992;&#25143; ID</span>&#65306;&#36825;&#37324;&#24744;&#21487;&#20197;&#35774;&#32622;&#20043;&#21069;&#25152;&#28155;&#21152;&#30340;&#29992;&#25143;&#30340; ID&#65288;&#25968;&#20540;&#65289;&#12290;&#33509;&#24744;&#19981;&#30830;&#23450;&#22914;&#20309;&#35774;&#32622;&#65292;&#35831;&#23558;&#20854;&#30041;&#31354;&#12290;
+ <p><span class="emphasis"><em>User ID</em></span>: 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.
</p>
</li>
<li class="listitem">
- <p><span class="guilabel">&#32452; ID</span>&#65306;&#36825;&#37324;&#24744;&#21487;&#20197;&#35774;&#32622;&#20043;&#21069;&#25152;&#28155;&#21152;&#30340;&#29992;&#25143;&#30340; &#32452; ID&#65288;&#25968;&#20540;&#65292;&#19968;&#33324;&#19982;&#29992;&#25143; ID
- &#30456;&#21516;&#65289;&#12290;&#33509;&#24744;&#19981;&#30830;&#23450;&#22914;&#20309;&#35774;&#32622;&#65292;&#35831;&#23558;&#20854;&#30041;&#31354;&#12290;
+ <p><span class="emphasis"><em>Group ID</em></span>: This lets you set the group ID. Again, if
+ unsure, leave it blank.
</p>
</li>
diff --git a/zh_cn/configureServices.html b/zh_cn/configureServices.html
index f453f59..3677a3e 100644
--- a/zh_cn/configureServices.html
+++ b/zh_cn/configureServices.html
@@ -6,7 +6,7 @@
<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
<link rel="home" href="index.html" title="&#29992; DrakX &#23433;&#35013;">
<link rel="up" href="index.html" title="&#29992; DrakX &#23433;&#35013;">
- <link rel="prev" href="selectCountry.html" title="&#36873;&#25321;&#24744;&#25152;&#22312;&#30340;&#22269;&#23478;/&#22320;&#21306;">
+ <link rel="prev" href="locale.html" title="Locale">
<link rel="next" href="selectMouse.html" title="&#36873;&#25321;&#40736;&#26631;"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
<!--
body { font-family: sans-serif; font-size: 13px }
@@ -32,27 +32,35 @@
+
-
- <p><a name="configureServices-pa1"></a>&#24744;&#21487;&#20197;&#22312;&#27492;&#22788;&#35774;&#32622;&#31995;&#32479;&#21551;&#21160;&#26102;&#38656;&#35201;&#21551;&#29992;&#30340;&#26381;&#21153;&#12290;
- </p>
-
-
- <p><a name="configureServices-pa2"></a>&#21333;&#20987;&#21508;&#32452;&#21069;&#30340;&#19977;&#35282;&#24418;&#22270;&#26631;&#21487;&#20197;&#23637;&#24320;&#35813;&#32452;&#20013;&#30340;&#26381;&#21153;&#12290;
- </p>
-
-
- <p><a name="configureServices-pa3"></a>DrakX&#33258;&#21160;&#36873;&#25321;&#30340;&#35774;&#32622;&#36890;&#24120;&#21487;&#27491;&#24120;&#24037;&#20316;&#12290;
+
+ <p><a name="configureServices-pa1"></a>Here you can choose which services should start when you boot your system.
</p>
-
- <p><a name="configureServices-pa4"></a>&#33509;&#39640;&#20142;&#36873;&#20013;&#26381;&#21153;&#65292;&#21017;&#21487;&#22312;&#19979;&#26041;&#30340;&#20449;&#24687;&#26694;&#20013;&#26597;&#30475;&#27492;&#26381;&#21153;&#30340;&#32454;&#33410;&#12290;
- </p>
+
+ <div class="itemizedlist">
+ <ul class="itemizedlist">
+ <li class="listitem">
+
+ <p><a name="configureServices-pa2"></a>Click on a triangle to expand a group to all the relevant services. The
+ settings DrakX chose are usually good.
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p><a name="configureServices-pa4"></a>&#33509;&#39640;&#20142;&#36873;&#20013;&#26381;&#21153;&#65292;&#21017;&#21487;&#22312;&#19979;&#26041;&#30340;&#20449;&#24687;&#26694;&#20013;&#26597;&#30475;&#27492;&#26381;&#21153;&#30340;&#32454;&#33410;&#12290;
+ </p>
+
+ </li>
+ </ul>
+ </div>
-
+
<p><a name="configureServices-pa5"></a>&#21482;&#26377;&#22312;&#24744;&#23436;&#20840;&#20102;&#35299;&#24744;&#30340;&#34892;&#20026;&#30340;&#39118;&#38505;&#21518;&#20877;&#20316;&#20986;&#25913;&#21160;&#12290;
</p>
-
+
</div>
</body>
</html>
diff --git a/zh_cn/diskPartitioning.html b/zh_cn/diskPartitioning.html
new file mode 100644
index 0000000..dd41f2e
--- /dev/null
+++ b/zh_cn/diskPartitioning.html
@@ -0,0 +1,716 @@
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+ <title>Partitioning</title>
+ <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+ <link rel="home" href="index.html" title="&#29992; DrakX &#23433;&#35013;">
+ <link rel="up" href="index.html" title="&#29992; DrakX &#23433;&#35013;">
+ <link rel="prev" href="selectKeyboard.html" title="&#38190;&#30424;">
+ <link rel="next" href="software.html" title="Software"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
+ <!--
+ body { font-family: sans-serif; font-size: 13px }
+ table { font-family: sans-serif; font-size: 13px }
+ --></style></head>
+ <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+ <div lang="zh_CN" class="section" title="Partitioning">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h2 class="title"><a name="diskPartitioning"></a>Partitioning
+ </h2>
+ </div>
+ </div>
+ </div>
+
+
+
+
+
+
+ <div lang="zh_CN" class="section" title="Suggested Partitioning">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h3 class="title"><a name="doPartitionDisks"></a>Suggested Partitioning
+ </h3>
+ </div>
+ </div>
+ </div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <p><a name="doPartitionDisks-pa1"></a>In this screen you can see the content of your hard drive(s) along with the
+ DrakX partitioning proposals for where to install Mageia.
+ </p>
+
+
+ <p><a name="doPartitionDisks-pa2"></a>The actual options available from those shown below will vary according to
+ the layout and content of your particular hard drive(s).
+ </p>
+
+
+
+
+ <div class="itemizedlist" title="Main Options">
+ <p class="title"><b>Main Options</b></p>
+ <ul class="itemizedlist">
+ <li class="listitem">
+
+ <p><a name="doPartitionDisks-pa4"></a><span class="bold"><strong>Use Existing Partitions</strong></span></p>
+
+
+ <p><a name="doPartitionDisks-pa5"></a>&#33509;&#27492;&#36873;&#39033;&#21487;&#29992;&#65292;&#34920;&#38754;&#23433;&#35013;&#31243;&#24207;&#25214;&#21040;&#20102;&#29616;&#23384;&#30340; Linux &#20998;&#21306;&#65292;&#24182;&#19988;&#21487;&#20197;&#23558;&#20854;&#29992;&#20110; Mageia &#30340;&#23433;&#35013;&#12290;
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p><a name="doPartitionDisks-pa6"></a><span class="bold"><strong>Use Free Space</strong></span></p>
+
+
+ <p><a name="doPartitionDisks-pa7"></a>&#33509;&#30828;&#30424;&#19978;&#26377;&#26410;&#20351;&#29992;&#30340;&#21306;&#22495;&#65292;&#27492;&#36873;&#39033;&#23558;&#20250;&#25226; Mageia &#23433;&#35013;&#21040;&#35813;&#21306;&#22495;&#20013;&#12290;
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p><a name="doPartitionDisks-pa8"></a><span class="bold"><strong>Use Free Space on a Windows Partition</strong></span></p>
+
+
+ <p><a name="suggestedPartitioning-pa9"></a>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!
+ </p>
+
+
+ <p>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
+ screenshot:
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p><a name="doPartitionDisks-pa12"></a><span class="bold"><strong>Erase and use Entire Disk</strong></span></p>
+
+
+ <p><a name="doPartitionDisks-pa13"></a>This option will allocate the entire drive for Mageia
+ </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><a name="doPartitionDisks-pa14"></a>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.
+ </p>
+
+ </td>
+ </tr>
+ </table>
+ </div>
+
+
+ <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="[&#37325;&#35201;]" src="important.png"></td>
+ <th align="left"></th>
+ </tr>
+ <tr>
+ <td align="left" valign="top">
+
+ <p><a name="doPartitionDisks-pa11"></a>&#23558;&#20250;&#32553;&#23567; Windows &#20998;&#21306;&#30340;&#22823;&#23567;&#12290;&#35813;&#20998;&#21306;&#24517;&#39035;&#20026;&#8220;clean&#8221;&#29366;&#24577;&#65292;&#21363;&#19978;&#19968;&#27425;&#20351;&#29992; Windows
+ &#26102;&#24517;&#39035;&#27491;&#24120;&#22320;&#20851;&#26426;&#25110;&#37325;&#21551;&#12290;&#21516;&#26102;&#65292;&#35813;&#20998;&#21306;&#20063;&#24212;&#24403;&#36827;&#34892;&#30862;&#29255;&#25972;&#29702;&#65292;&#21363;&#20415;&#19981;&#33021;&#23558;&#25991;&#20214;&#30862;&#29255;&#23436;&#20840;&#31227;&#20986;&#24453;&#20351;&#29992;&#21306;&#22495;&#12290;&#25105;&#20204;&#25512;&#33616;&#24744;&#23545;&#20010;&#20154;&#25991;&#20214;&#36827;&#34892;&#22791;&#20221;&#21518;&#20877;&#36827;&#34892;&#27492;&#25805;&#20316;&#12290;
+ </p>
+
+ </td>
+ </tr>
+ </table>
+ </div>
+
+ </li>
+ <li class="listitem">
+
+ <p><a name="doPartitionDisks-pa16"></a><span class="bold"><strong>Custom Disk Partitioning</strong></span></p>
+
+
+ <p><a name="doPartitionDisks-pa17"></a>&#20801;&#35768;&#24744;&#23436;&#20840;&#25511;&#21046;&#31995;&#32479;&#22312;&#30828;&#30424;&#19978;&#30340;&#23433;&#35013;&#26041;&#24335;&#12290;
+ </p>
+
+ </li>
+ </ul>
+ </div>
+
+
+
+
+ <p>If you are not using the <span class="emphasis"><em>Custom disk partitioning</em></span>
+ option, then the installer will allocate the available space according to
+ the following rules:
+ </p>
+
+
+ <div class="itemizedlist">
+ <ul class="itemizedlist">
+ <li class="listitem">
+
+ <p>If the total available space is less than 50 GB, then only one partition is
+ created. This will be the <code class="filename">/</code> (root) partition.
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p>If the total available space is greater than 50 GB, then three partitions
+ are created
+ </p>
+
+
+ <div class="itemizedlist">
+ <ul class="itemizedlist">
+ <li class="listitem">
+
+ <p>6/19 of the total available place is allocated to <code class="filename">/</code>
+ with a maximum of 50 GB
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p>1/19 is allocated to <code class="filename">swap</code> with a maximum of 4 GB
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p>the rest (at least 12/19) is allocated to <code class="filename">/home</code></p>
+
+ </li>
+ </ul>
+ </div>
+
+ </li>
+ </ul>
+ </div>
+
+
+ <p>This means that from 160 GB or greater available space, the installer will
+ create three partitions:
+ </p>
+
+
+ <div class="itemizedlist">
+ <ul class="itemizedlist">
+ <li class="listitem">
+
+ <p>50 GB for <code class="filename">/</code></p>
+
+ </li>
+ <li class="listitem">
+
+ <p>4 GB for <code class="filename">swap</code></p>
+
+ </li>
+ <li class="listitem">
+
+ <p>and the remainder for <code class="filename">/home</code></p>
+
+ </li>
+ </ul>
+ </div>
+
+
+ <div class="note" title="&#27880;&#24847;" style="margin-left: 0.5in; margin-right: 0.5in;">
+ <table border="0" summary="Note">
+ <tr>
+ <td rowspan="2" align="center" valign="top" width="25"><img alt="[&#27880;&#24847;]" src="note.png"></td>
+ <th align="left"></th>
+ </tr>
+ <tr>
+ <td align="left" valign="top">
+
+ <p>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 <code class="filename">/boot/EFI</code>. The <span class="emphasis"><em>Custom disk
+ partitioning</em></span> option is the only one that allows to check it has
+ been correctly done.
+ </p>
+
+
+ <p>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 <span class="emphasis"><em>Custom disk partitioning</em></span>, like any
+ other partition. Be sure to select <span class="quote">&#8220;<span class="quote">BIOS boot partition</span>&#8221;</span> for
+ filesystem type.
+ </p>
+
+
+ <p>See <a class="xref" href="diskPartitioning.html#diskdrake" title="Custom Disk Partitioning with DiskDrake">DiskDrake</a> for information on how to proceed.
+ </p>
+
+ </td>
+ </tr>
+ </table>
+ </div>
+
+
+
+
+
+
+ <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="[&#37325;&#35201;]" src="important.png"></td>
+ <th align="left"></th>
+ </tr>
+ <tr>
+ <td align="left" valign="top">
+
+ <p>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.
+ </p>
+
+
+ <p>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:
+ </p>
+
+
+ <div class="itemizedlist">
+ <ul class="itemizedlist">
+ <li class="listitem">
+
+ <p><span class="emphasis"><em>Align to</em></span> = MiB
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p><span class="emphasis"><em>Free space preceding (MiB)</em></span> = 2
+ </p>
+
+ </li>
+ </ul>
+ </div>
+
+
+ <p>Also make sure all partitions are created using an even number of megabytes.</p>
+
+ </td>
+ </tr>
+ </table>
+ </div>
+
+ </div>
+
+
+ <div lang="zh_CN" class="section" title="&#36873;&#25321;&#25346;&#36733;&#28857;">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h3 class="title"><a name="ask_mntpoint_s"></a>&#36873;&#25321;&#25346;&#36733;&#28857;
+ </h3>
+ </div>
+ </div>
+ </div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <p>Here you see the Linux partitions that have been found on your computer. If
+ you don't agree with the DrakX suggestions, you can change the mount points
+ yourself.
+ </p>
+
+
+ <div class="itemizedlist">
+ <ul class="itemizedlist">
+ <li class="listitem">
+
+ <p>To the left of the drop-down menus is a list of available partitions. For
+ example: <code class="filename">sda</code> is a hard drive - and
+ <code class="filename">5</code> is a <span class="emphasis"><em>partition number</em></span>, followed
+ by the<span class="emphasis"><em> (capacity, mount point, filesystem type)</em></span> of the
+ partition.
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p>If you have several partitions, you can choose various different
+ <span class="emphasis"><em>mount points</em></span> from the drop down menu, such as
+ <code class="filename">/</code>, <code class="filename">/home</code> and
+ <code class="filename">/var</code>. You can even make your own mount points, for
+ instance <code class="filename">/video</code> for a partition where you want to store
+ your films, or perhaps <code class="filename">/Data</code> for all your data files.
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p>For any partitions that you don't need to make use of, you can leave the
+ mount point field blank.
+ </p>
+
+ </li>
+ </ul>
+ </div>
+
+
+ <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>If you make any changes here, ensure you still have a <code class="filename">/</code>
+ (root) partition.
+ </p>
+
+ </td>
+ </tr>
+ </table>
+ </div>
+
+
+ <div class="tip" title="&#25552;&#31034;" style="margin-left: 0.5in; margin-right: 0.5in;">
+ <table border="0" summary="Tip">
+ <tr>
+ <td rowspan="2" align="center" valign="top" width="25"><img alt="[&#25552;&#31034;]" src="tip.png"></td>
+ <th align="left"></th>
+ </tr>
+ <tr>
+ <td align="left" valign="top">
+
+ <p>If you are not sure what to choose, click <span class="emphasis"><em>Previous</em></span> to
+ go back and then tick <span class="emphasis"><em>Custom disk partitioning</em></span>, where
+ you can click on a partition to see its type and size.
+ </p>
+
+ </td>
+ </tr>
+ </table>
+ </div>
+
+
+ <p>If you are sure the mount points are correct, click on
+ <span class="emphasis"><em>Next</em></span>, and choose whether you only want to format the
+ partition suggested by DrakX, or more.
+ </p>
+
+ </div>
+
+
+ <div lang="zh_CN" class="section" title="&#30830;&#23450;&#35201;&#26684;&#24335;&#21270;&#30340;&#30828;&#30424;">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h3 class="title"><a name="takeOverHdConfirm"></a>&#30830;&#23450;&#35201;&#26684;&#24335;&#21270;&#30340;&#30828;&#30424;
+ </h3>
+ </div>
+ </div>
+ </div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <div class="itemizedlist">
+ <ul class="itemizedlist">
+ <li class="listitem">
+
+ <p><a name="takeOverHdConfirm-pa1"></a>Click on <span class="emphasis"><em>Previous</em></span> if you are at all unsure about your
+ choice.
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p><a name="takeOverHdConfirm-pa2"></a>Click on <span class="emphasis"><em>Next</em></span> to proceed if you are sure that it is OK
+ to erase <span class="bold"><strong>every</strong></span> partition, <span class="bold"><strong>every</strong></span> operating system and <span class="bold"><strong>all
+ data</strong></span> that might be on that hard disk.
+ </p>
+
+ </li>
+ </ul>
+ </div>
+
+ </div>
+
+
+ <div lang="zh_CN" class="section" title="Custom Disk Partitioning with DiskDrake">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h3 class="title"><a name="diskdrake"></a>Custom Disk Partitioning with DiskDrake
+ </h3>
+ </div>
+ </div>
+ </div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <div class="itemizedlist">
+ <ul class="itemizedlist">
+ <li class="listitem">
+
+ <p><a name="diskdrake-pa3"></a>Modify the layout of your disk(s) here. You can remove or create partitions,
+ change the filesystem or size of a partition and even view their details
+ before you start.
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p><a name="diskdrake-pa4"></a>There is a tab at the top for every detected hard disk (or other storage
+ device, like a USB key). In the screenshot above there are two available
+ devices: <code class="filename">sda </code>and <code class="filename">sdb</code>.
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p><a name="diskdrake-pa6"></a>For all other actions: click on the desired partition first. Then view it,
+ or choose a filesystem and a mount point, resize it or wipe
+ it. <span class="emphasis"><em>Expert mode</em></span> provides more options such as to label
+ (name) a partition, or to choose a partition type.
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p><a name="diskdrake-pa6a"></a>Continue until you have adjusted everything to your satisfaction, then click
+ <span class="emphasis"><em>Done</em></span> when you're ready.
+ </p>
+
+ </li>
+ </ul>
+ </div>
+
+
+ <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">
+
+ <div class="orderedlist">
+ <ol class="orderedlist" type="1">
+ <li class="listitem">
+
+ <p><a name="diskdrake-pa5"></a>Take care with the <span class="emphasis"><em>Clear all</em></span> option, use it only if you
+ are sure you want to wipe all partitions on the selected storage device.
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p><a name="diskdrake-pa1"></a>If you wish to use encryption on your <code class="filename">/</code> partition you
+ must ensure that you have a separate <code class="filename">/boot</code>
+ partition. The encryption option for the <code class="filename">/boot</code>
+ partition must NOT be set, otherwise your system will be unbootable.
+ </p>
+
+ </li>
+ </ol>
+ </div>
+
+ </td>
+ </tr>
+ </table>
+ </div>
+
+
+ <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="[&#37325;&#35201;]" src="important.png"></td>
+ <th align="left"></th>
+ </tr>
+ <tr>
+ <td align="left" valign="top">
+
+ <div class="itemizedlist">
+ <ul class="itemizedlist">
+ <li class="listitem">
+
+ <p>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
+ Partition) is present and correctly mounted on
+ <code class="filename">/boot/EFI</code>. See Figure 1 below.
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
+ partition is present and of the correct type. See Figure 2 below.
+ </p>
+
+ </li>
+ </ul>
+ </div>
+
+ </td>
+ </tr>
+ </table>
+ </div>
+
+
+
+
+
+ </div>
+
+
+ <div lang="zh_CN" class="section" title="&#26684;&#24335;&#21270;">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h3 class="title"><a name="formatPartitions"></a>&#26684;&#24335;&#21270;
+ </h3>
+ </div>
+ </div>
+ </div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <p><a name="formatPartitions-pa1"></a>Here you can choose which partition(s) you wish to format. Any data on
+ partitions <span class="emphasis"><em>not</em></span> marked for formatting will be preserved.
+ </p>
+
+
+ <p><a name="formatPartitions-pa2"></a>Usually, at least the partitions that DrakX selected need to be formatted.
+ </p>
+
+
+ <p><a name="formatPartitions-pa3"></a>Click on <span class="emphasis"><em>Advanced</em></span> to choose the partitions you want to
+ check for so-called <span class="emphasis"><em>bad blocks</em></span></p>
+
+
+ <div class="tip" title="&#25552;&#31034;" style="margin-left: 0.5in; margin-right: 0.5in;">
+ <table border="0" summary="Tip">
+ <tr>
+ <td rowspan="2" align="center" valign="top" width="25"><img alt="[&#25552;&#31034;]" src="tip.png"></td>
+ <th align="left"></th>
+ </tr>
+ <tr>
+ <td align="left" valign="top">
+
+ <p><a name="formatPartitions-pa4"></a>If you're not sure you have made the right choice, you can click on
+ <span class="emphasis"><em>Previous</em></span>, again on <span class="emphasis"><em>Previous</em></span> and
+ then on <span class="emphasis"><em>Custom</em></span> to get back to the main screen, where
+ you can choose to view details of your partitions.
+ </p>
+
+ </td>
+ </tr>
+ </table>
+ </div>
+
+
+ <p><a name="formatPartitions-pa5"></a>When you are confident about the selections, click on
+ <span class="emphasis"><em>Next</em></span> to continue.
+ </p>
+
+ </div>
+
+ </div>
+ </body>
+</html>
diff --git a/zh_cn/exitInstall.html b/zh_cn/exitInstall.html
index ba31d05..7487479 100644
--- a/zh_cn/exitInstall.html
+++ b/zh_cn/exitInstall.html
@@ -28,12 +28,18 @@
+
+
+
+
- <p><a name="exitInstall-pa1"></a>&#24744;&#20197;&#23436;&#25104;&#23433;&#35013;&#21644;&#37197;&#32622; Mageia&#65292;&#29616;&#22312;&#21487;&#20197;&#23433;&#20840;&#22320;&#31227;&#38500;&#23433;&#35013;&#20171;&#36136;&#24182;&#37325;&#26032;&#21551;&#21160;&#12290;
+ <p><a name="exitInstall-pa1"></a>You have finished installing and configuring Mageia and it is now safe to
+ remove the installation medium and reboot your computer.
</p>
- <p><a name="exitInstall-pa2"></a>&#37325;&#21551;&#20043;&#21518;&#65292;&#22312;&#24341;&#23548;&#30028;&#38754;&#21487;&#20197;&#30475;&#21040;&#25805;&#20316;&#31995;&#32479;&#36873;&#39033;&#65288;&#33509;&#24744;&#30340;&#35745;&#31639;&#26426;&#19978;&#26377;&#20004;&#20010;&#20197;&#19978;&#25805;&#20316;&#31995;&#32479;&#65289;&#12290;
+ <p><a name="exitInstall-pa2"></a>After rebooting, you can use the bootloader screen to choose which operating
+ system to start (if there are more than one on your computer).
</p>
@@ -45,7 +51,8 @@
</p>
- <p><a name="exitInstall-pa5"></a>&#33509;&#24744;&#26377;&#20219;&#20309;&#30097;&#38382;&#65292;&#25110;&#24076;&#26395;&#24110;&#21161;&#23436;&#21892; Mageia&#65292;&#35831;&#35775;&#38382; www.mageia.org&#12290;
+ <p><a name="exitInstall-pa5"></a>Visit <a class="ulink" href="http://www.mageia.org/en/" target="_top">www.mageia.org/en/</a>
+ if you have any questions or want to contribute to Mageia
</p>
</div>
diff --git a/zh_cn/firewall.html b/zh_cn/firewall.html
new file mode 100644
index 0000000..601b18c
--- /dev/null
+++ b/zh_cn/firewall.html
@@ -0,0 +1,95 @@
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+ <title>Firewall</title>
+ <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+ <link rel="home" href="index.html" title="&#29992; DrakX &#23433;&#35013;">
+ <link rel="up" href="index.html" title="&#29992; DrakX &#23433;&#35013;">
+ <link rel="prev" href="securityLevel.html" title="&#23433;&#20840;&#32423;&#21035;">
+ <link rel="next" href="installUpdates.html" title="&#26356;&#26032;"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
+ <!--
+ body { font-family: sans-serif; font-size: 13px }
+ table { font-family: sans-serif; font-size: 13px }
+ --></style></head>
+ <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+ <div lang="zh_CN" class="section" title="Firewall">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h2 class="title"><a name="firewall"></a>Firewall
+ </h2>
+ </div>
+ </div>
+ </div>
+
+
+
+
+
+
+
+ <p><a name="firewall-pa1"></a>This section allows you to configure some simple firewall rules: they
+ determine which type of message from the Internet will be accepted by the
+ target system. This, in turn, allows the corresponding services on the
+ system to be accessible from the Internet.
+ </p>
+
+
+ <p>In the default setting (no button is checked), no service of the system is
+ accessible from the network. The <span class="emphasis"><em>Everything (no
+ firewall)</em></span> option enables access to all services of the machine -
+ an option that does not make much sense in the context of the installer
+ since it would create a totally unprotected system. Its veritable use is in
+ the context of the Mageia Control Center (which uses the same GUI layout)
+ for temporarily disabling the entire set of firewall rules for testing and
+ debugging purposes.
+ </p>
+
+
+ <p>All other options are more or less self-explanatory. As an example, you will
+ enable the CUPS server if you want printers on your machine to be accessible
+ from the network.
+ </p>
+
+
+ <p><span class="bold"><strong>Advanced</strong></span></p>
+
+
+ <p>The <span class="emphasis"><em>Advanced</em></span> option opens a window where you can enable
+ a series of services by typing a list of <span class="quote">&#8220;<span class="quote">couples</span>&#8221;</span> (blank
+ separated)
+ </p>
+
+
+ <p><span class="emphasis"><em>&lt;port-number&gt;/&lt;protocol&gt;</em></span></p>
+
+
+ <table border="0" summary="Simple list" class="simplelist">
+ <tr>
+ <td>- <span class="emphasis"><em>&lt;port-number&gt;</em></span> is the value of the port assigned to
+ the service you want to enable (e.g. 873 for the RSYNC service) as defined
+ in <span class="emphasis"><em>RFC-433</em></span>;
+ </td>
+ </tr>
+ <tr>
+ <td>- <span class="emphasis"><em>&lt;protocol&gt;</em></span> is one of <span class="emphasis"><em>TCP</em></span> or
+ <span class="emphasis"><em>UDP</em></span> - the internet protocol that is used by the
+ service.
+ </td>
+ </tr>
+ </table>
+
+
+ <p>For instance, the entry for enabling access to the RSYNC service therefore
+ is <span class="emphasis"><em>873/tcp</em></span>.
+ </p>
+
+
+ <p>In case a service is implemented to use both protocols, you specify 2
+ couples for the same port.
+ </p>
+
+ </div>
+ </body>
+</html>
diff --git a/zh_cn/graphicalConfiguration.html b/zh_cn/graphicalConfiguration.html
new file mode 100644
index 0000000..db6308c
--- /dev/null
+++ b/zh_cn/graphicalConfiguration.html
@@ -0,0 +1,363 @@
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+ <title>Graphical Configuration</title>
+ <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+ <link rel="home" href="index.html" title="&#29992; DrakX &#23433;&#35013;">
+ <link rel="up" href="index.html" title="&#29992; DrakX &#23433;&#35013;">
+ <link rel="prev" href="addUser.html" title="User Management">
+ <link rel="next" href="setupBootloader.html" title="Bootloader"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
+ <!--
+ body { font-family: sans-serif; font-size: 13px }
+ table { font-family: sans-serif; font-size: 13px }
+ --></style></head>
+ <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+ <div lang="zh_CN" class="section" title="Graphical Configuration">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h2 class="title"><a name="graphicalConfiguration"></a>Graphical Configuration
+ </h2>
+ </div>
+ </div>
+ </div>
+
+
+
+
+
+ <div lang="zh_CN" class="section" title="&#26174;&#31034;&#21345;&#21644;&#26174;&#31034;&#22120;&#37197;&#32622;">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h3 class="title"><a name="configureX_chooser"></a>&#26174;&#31034;&#21345;&#21644;&#26174;&#31034;&#22120;&#37197;&#32622;
+ </h3>
+ </div>
+ </div>
+ </div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <p><a name="configureX_chooser-pa1"></a>No matter which graphical environment (also known as desktop environment)
+ you chose for this install of Mageia, they are all based on a graphical user
+ interface system called <code class="literal">X Window System</code>, or simply
+ <span class="quote">&#8220;<span class="quote">X</span>&#8221;</span>. So in order for KDE Plasma, GNOME, LXDE or any other
+ graphical environment to work well, the following <span class="quote">&#8220;<span class="quote">X</span>&#8221;</span> settings
+ need to be correct.
+ </p>
+
+
+ <p>Choose the appropriate settings manually if you think the details are
+ incorrect, or if none are shown.
+ </p>
+
+
+ <div class="itemizedlist">
+ <ul class="itemizedlist">
+ <li class="listitem">
+
+ <p><a name="configureX_chooser-pa2"></a><span class="bold"><strong>Graphic Card</strong></span></p>
+
+
+ <p>If you need to, you can select a specific card from this expandable
+ list. See <a class="xref" href="graphicalConfiguration.html#configureX_card_list" title="&#36873;&#25321;&#19968;&#20010;X&#26381;&#21153;&#22120;(&#37197;&#32622;&#24744;&#30340;&#26174;&#31034;&#21345;)">&#8220;&#36873;&#25321;&#19968;&#20010;X&#26381;&#21153;&#22120;(&#37197;&#32622;&#24744;&#30340;&#26174;&#31034;&#21345;)&#8221;&#19968;&#33410;</a>.
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p><a name="configureX_chooser-pa3"></a><span class="bold"><strong>Monitor</strong></span></p>
+
+
+ <p>You can choose Plug 'n Play, if applicable, or choose your monitor from the
+ <span class="emphasis"><em>Vendor</em></span> or <span class="emphasis"><em>Generic</em></span> lists. Choose
+ <span class="emphasis"><em>Custom</em></span> if you prefer to manually set the horizontal and
+ vertical refresh rates of your monitor. See <a class="xref" href="graphicalConfiguration.html#configureX_monitor" title="&#36873;&#25321;&#24744;&#30340;&#26174;&#31034;&#22120;">&#8220;&#36873;&#25321;&#24744;&#30340;&#26174;&#31034;&#22120;&#8221;&#19968;&#33410;</a>.
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p><a name="configureX_chooser-pa4"></a><span class="bold"><strong>Resolution</strong></span></p>
+
+
+ <p>The resolution and color depth of your monitor can be set here.</p>
+
+ </li>
+ <li class="listitem">
+
+ <p><a name="configureX_chooser-pa5"></a><span class="bold"><strong>Test</strong></span></p>
+
+
+ <p>The test button does not always appear during install. If the option is
+ there, and you test your settings, you should be asked to confirm that your
+ settings are correct. If you answer <span class="emphasis"><em>Yes</em></span>, the settings
+ will be kept. If you don't see anything, you'll return to the configuration
+ screen and be able to reconfigure everything until the test result is
+ satisfactory. If the test option is not available, then make sure your
+ settings are on the safe side.
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p><a name="configureX_chooser-pa6"></a><span class="bold"><strong>Options</strong></span></p>
+
+
+ <p>Here you can choose to enable or disable various options.</p>
+
+ </li>
+ </ul>
+ </div>
+
+
+ <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><a name="configureX_chooser-pa3a"></a>There is a risk of damaging a monitor if you choose refresh rates that are
+ outside the frequency range of that monitor. This applies to older CRT
+ displays: modern monitors will reject an unsupported frequency and normally
+ enter standby mode.
+ </p>
+
+ </td>
+ </tr>
+ </table>
+ </div>
+
+ </div>
+
+
+ <div lang="zh_CN" class="section" title="&#36873;&#25321;&#19968;&#20010;X&#26381;&#21153;&#22120;(&#37197;&#32622;&#24744;&#30340;&#26174;&#31034;&#21345;)">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h3 class="title"><a name="configureX_card_list"></a>&#36873;&#25321;&#19968;&#20010;X&#26381;&#21153;&#22120;(&#37197;&#32622;&#24744;&#30340;&#26174;&#31034;&#21345;)
+ </h3>
+ </div>
+ </div>
+ </div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <p>DrakX &#26377;&#40784;&#20840;&#30340;&#26174;&#21345;&#25968;&#25454;&#24211;&#65292;&#19968;&#33324;&#24773;&#20917;&#19979;&#21487;&#20197;&#27491;&#30830;&#35782;&#21035;&#24744;&#30340;&#35270;&#39057;&#35774;&#22791;&#12290;</p>
+
+
+ <p>&#33509;&#23433;&#35013;&#31243;&#24207;&#26080;&#27861;&#27491;&#30830;&#26816;&#27979;&#24744;&#30340;&#26174;&#21345;&#65292;&#35831;&#22312;&#20197;&#19979;&#21015;&#34920;&#20013;&#36873;&#25321;&#19968;&#20010;&#21512;&#36866;&#30340;&#37197;&#32622;&#65306; </p>
+ <div class="itemizedlist">
+ <ul class="itemizedlist">
+ <li class="listitem">
+
+ <p>Vendor</p>
+
+ </li>
+ <li class="listitem">
+
+ <p>then the make of your card</p>
+
+ </li>
+ <li class="listitem">
+
+ <p>and the model of card</p>
+
+ </li>
+ </ul>
+ </div>
+
+
+ <p>If you cannot find your card in the vendor lists (because it's not yet in
+ the database or it's an older card) you may find a suitable driver in the
+ <span class="emphasis"><em>Xorg</em></span> category, which provides more than 40 generic and
+ open source video card drivers. If you still can't find a specific driver
+ for your card there is the option of using the VESA driver which provides
+ basic capabilities.
+ </p>
+
+
+ <div class="caution" title="&#23567;&#24515;" style="margin-left: 0.5in; margin-right: 0.5in;">
+ <table border="0" summary="Caution">
+ <tr>
+ <td rowspan="2" align="center" valign="top" width="25"><img alt="[&#23567;&#24515;]" src="caution.png"></td>
+ <th align="left"></th>
+ </tr>
+ <tr>
+ <td align="left" valign="top">
+
+ <p>Be aware that if you select an incompatible driver you may only have access
+ to the <span class="emphasis"><em>Command Line Interface</em></span></p>
+
+ </td>
+ </tr>
+ </table>
+ </div>
+
+
+ <p>Some video card manufacturers provide proprietary drivers for Linux which
+ may only be available in the <span class="emphasis"><em>Nonfree</em></span> repository and in
+ some cases only from the card manufacturers' websites. The
+ <span class="emphasis"><em>Nonfree</em></span> repository needs to be explicitly enabled to
+ access them. If you didn't enable it previously, you should do this after
+ your first reboot.
+ </p>
+
+ </div>
+
+
+ <div lang="zh_CN" class="section" title="&#36873;&#25321;&#24744;&#30340;&#26174;&#31034;&#22120;">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h3 class="title"><a name="configureX_monitor"></a>&#36873;&#25321;&#24744;&#30340;&#26174;&#31034;&#22120;
+ </h3>
+ </div>
+ </div>
+ </div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <p><a name="configureX_monitor-pa1"></a>DrakX &#26377;&#40784;&#20840;&#30340;&#26174;&#21345;&#25968;&#25454;&#24211;&#65292;&#19968;&#33324;&#24773;&#20917;&#19979;&#21487;&#20197;&#27491;&#30830;&#35782;&#21035;&#24744;&#30340;&#35270;&#39057;&#35774;&#22791;&#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><a name="configureX_monitor-pa1w"></a><span class="bold"><strong>Selecting a monitor with different characteristics
+ could damage your monitor or video hardware. Please don't try something
+ without knowing what you are doing.</strong></span> If in doubt you should
+ consult your monitor documentation.
+ </p>
+
+ </td>
+ </tr>
+ </table>
+ </div>
+
+
+
+
+ <div class="variablelist">
+ <dl>
+ <dt><span class="term"><a name="configureX_monitor-pa2"></a>&#33258;&#23450;&#20041;</span></dt>
+ <dd>
+
+ <p><a name="configureX_monitor-pa3"></a>This option allows you to set two critical parameters: the vertical refresh
+ rate and the horizontal sync rate. Vertical refresh determines how often the
+ screen is refreshed and horizontal sync is the rate at which scan lines are
+ displayed.
+ </p>
+
+
+ <p><a name="configureX_monitor-pa4"></a><span class="emphasis"><em>&#35831;&#19981;&#35201;</em></span>&#36873;&#25321;&#19982;&#24744;&#30340;&#26174;&#31034;&#22120;&#19981;&#21305;&#37197;&#30340;&#21516;&#27493;&#33539;&#22260;&#65292;&#36825;&#26679;&#20570;&#21487;&#33021;&#25439;&#23475;&#26174;&#31034;&#22120;&#12290;&#33509;&#20173;&#26377;&#30097;&#38382;&#65292;&#35831;&#26597;&#35810;&#26174;&#31034;&#22120;&#25991;&#26723;&#12290;
+ </p>
+
+ </dd>
+ <dt><span class="term"><a name="configureX_monitor-pa5"></a>Plug'n Play</span></dt>
+ <dd>
+
+ <p><a name="configureX_monitor-pa6"></a>This is the default option and automatically tries to determine the monitor
+ type from the monitor database.
+ </p>
+
+ </dd>
+ <dt><span class="term"><a name="configureX_monitor-pa7"></a>Vendor</span></dt>
+ <dd>
+
+ <p><a name="configureX_monitor-pa8"></a>&#33509;&#23433;&#35013;&#31243;&#24207;&#26080;&#27861;&#27491;&#30830;&#26816;&#27979;&#24744;&#30340;&#26174;&#31034;&#22120;&#65292;&#35831;&#22312;&#20197;&#19979;&#21015;&#34920;&#20013;&#36873;&#25321;&#19968;&#20010;&#21512;&#36866;&#30340;&#37197;&#32622;&#65306;
+ </p>
+
+ </dd>
+ </dl>
+ </div>
+
+
+ <div class="itemizedlist">
+ <ul class="itemizedlist">
+ <li class="listitem">
+
+ <p>Manufacturer</p>
+
+ </li>
+ <li class="listitem">
+
+ <p>Monitor model</p>
+
+ </li>
+ </ul>
+ </div>
+
+
+ <div class="variablelist">
+ <dl>
+ <dt><span class="term"><a name="configureX_monitor-pa9"></a>Generic</span></dt>
+ <dd>
+
+ <p><a name="configureX_monitor-pa10"></a>Selecting this group will list nearly 30 display configurations such as
+ 1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is
+ often a good monitor selection group if you need to use the VESA card driver
+ when your video hardware cannot be determined automatically. Once again it
+ may be wise to be conservative in your selections.
+ </p>
+
+ </dd>
+ </dl>
+ </div>
+
+ </div>
+
+ </div>
+ </body>
+</html>
diff --git a/zh_cn/index.html b/zh_cn/index.html
index bf1e7e7..0615f30 100644
--- a/zh_cn/index.html
+++ b/zh_cn/index.html
@@ -27,16 +27,17 @@
<dd>
<dl>
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e19">&#31616;&#20171;</a></span></dt>
- <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e29">&#20171;&#36136;</a></span></dt>
- <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e119">&#19979;&#36733;&#21644;&#26816;&#26597;&#23186;&#20171;</a></span></dt>
- <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e146">&#21051;&#24405;&#25110;&#36716;&#20648; ISO</a></span></dt>
+ <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e41">&#20171;&#36136;</a></span></dt>
+ <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e129">&#19979;&#36733;&#21644;&#26816;&#26597;&#23186;&#20171;</a></span></dt>
+ <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e168">&#21051;&#24405;&#25110;&#36716;&#20648; ISO</a></span></dt>
</dl>
</dd>
<dt><span class="section"><a href="installer.html">DrakX&#65292;Mageia &#30340;&#23433;&#35013;&#22120;</a></span></dt>
<dd>
<dl>
- <dt><span class="section"><a href="installer.html#installationSteps">&#23433;&#35013;&#27493;&#39588;</a></span></dt>
- <dt><span class="section"><a href="installer.html#installationProblems">&#23433;&#35013;&#38382;&#39064;&#21644;&#38382;&#39064;&#35299;&#20915;&#26041;&#26696;</a></span></dt>
+ <dt><span class="section"><a href="installer.html#d5e261">&#23433;&#35013;&#27493;&#39588;</a></span></dt>
+ <dt><span class="section"><a href="installer.html#d5e283">&#23433;&#35013;&#27426;&#36814;&#23631;&#24149;</a></span></dt>
+ <dt><span class="section"><a href="installer.html#d5e332">&#23433;&#35013;&#38382;&#39064;&#21644;&#38382;&#39064;&#35299;&#20915;&#26041;&#26696;</a></span></dt>
</dl>
</dd>
<dt><span class="section"><a href="selectLanguage.html">&#35831;&#36873;&#25321;&#35201;&#20351;&#29992;&#30340;&#35821;&#35328;</a></span></dt>
@@ -50,40 +51,51 @@
<dt><span class="section"><a href="setupSCSI.html">&#35774;&#32622;SCSI</a></span></dt>
<dt><span class="section"><a href="selectInstallClass.html">&#26032;&#23433;&#35013;&#25110;&#21319;&#32423;</a></span></dt>
<dt><span class="section"><a href="selectKeyboard.html">&#38190;&#30424;</a></span></dt>
- <dt><span class="section"><a href="doPartitionDisks.html">&#20998;&#21306;</a></span></dt>
- <dt><span class="section"><a href="ask_mntpoint_s.html">&#36873;&#25321;&#25346;&#36733;&#28857;</a></span></dt>
- <dt><span class="section"><a href="takeOverHdConfirm.html">&#30830;&#23450;&#35201;&#26684;&#24335;&#21270;&#30340;&#30828;&#30424;</a></span></dt>
- <dt><span class="section"><a href="diskdrake.html">&#20351;&#29992; DiskDrake &#33258;&#23450;&#20041;&#30913;&#30424;&#20998;&#21306;&#26041;&#24335;</a></span></dt>
- <dt><span class="section"><a href="formatPartitions.html">&#26684;&#24335;&#21270;</a></span></dt>
- <dt><span class="section"><a href="add_supplemental_media.html">&#20171;&#36136;&#36873;&#25321; (&#35774;&#32622;&#22686;&#34917;&#30340;&#23433;&#35013;&#20171;&#36136;)</a></span></dt>
- <dt><span class="section"><a href="media_selection.html">&#20171;&#36136;&#36873;&#25321; (Nonfree)</a></span></dt>
- <dt><span class="section"><a href="chooseDesktop.html">&#26700;&#38754;&#29615;&#22659;&#36873;&#25321;</a></span></dt>
- <dt><span class="section"><a href="choosePackageGroups.html">&#36873;&#25321;&#36719;&#20214;&#21253;&#32452;</a></span></dt>
- <dt><span class="section"><a href="minimal-install.html">&#26368;&#23567;&#23433;&#35013;</a></span></dt>
- <dt><span class="section"><a href="choosePackagesTree.html">&#36873;&#25321;&#21333;&#20010;&#36719;&#20214;&#21253;</a></span></dt>
- <dt><span class="section"><a href="addUser.html">&#29992;&#25143;&#21644;&#31649;&#29702;&#21592;&#31649;&#29702;</a></span></dt>
+ <dt><span class="section"><a href="diskPartitioning.html">Partitioning</a></span></dt>
+ <dd>
+ <dl>
+ <dt><span class="section"><a href="diskPartitioning.html#doPartitionDisks">Suggested Partitioning</a></span></dt>
+ <dt><span class="section"><a href="diskPartitioning.html#ask_mntpoint_s">&#36873;&#25321;&#25346;&#36733;&#28857;</a></span></dt>
+ <dt><span class="section"><a href="diskPartitioning.html#takeOverHdConfirm">&#30830;&#23450;&#35201;&#26684;&#24335;&#21270;&#30340;&#30828;&#30424;</a></span></dt>
+ <dt><span class="section"><a href="diskPartitioning.html#diskdrake">Custom Disk Partitioning with DiskDrake</a></span></dt>
+ <dt><span class="section"><a href="diskPartitioning.html#formatPartitions">&#26684;&#24335;&#21270;</a></span></dt>
+ </dl>
+ </dd>
+ <dt><span class="section"><a href="software.html">Software</a></span></dt>
+ <dd>
+ <dl>
+ <dt><span class="section"><a href="software.html#d5e703">Media Selection</a></span></dt>
+ <dt><span class="section"><a href="software.html#chooseDesktop">&#26700;&#38754;&#29615;&#22659;&#36873;&#25321;</a></span></dt>
+ <dt><span class="section"><a href="software.html#choosePackageGroups">&#36873;&#25321;&#36719;&#20214;&#21253;&#32452;</a></span></dt>
+ <dt><span class="section"><a href="software.html#minimal-install">&#26368;&#23567;&#23433;&#35013;</a></span></dt>
+ <dt><span class="section"><a href="software.html#choosePackagesTree">&#36873;&#25321;&#21333;&#20010;&#36719;&#20214;&#21253;</a></span></dt>
+ </dl>
+ </dd>
+ <dt><span class="section"><a href="addUser.html">User Management</a></span></dt>
<dd>
<dl>
<dt><span class="section"><a href="addUser.html#root-password">&#35774;&#32622;&#31649;&#29702;&#21592;&#65288;root &#36134;&#25143;&#65289;&#23494;&#30721;&#65306;</a></span></dt>
<dt><span class="section"><a href="addUser.html#enterUser">&#36755;&#20837;&#29992;&#25143;&#21517;</a></span></dt>
- <dt><span class="section"><a href="addUser.html#addUserAdvanced">&#39640;&#32423;&#29992;&#25143;&#31649;&#29702;</a></span></dt>
+ <dt><span class="section"><a href="addUser.html#addUserAdvanced">User Management (advanced)</a></span></dt>
+ </dl>
+ </dd>
+ <dt><span class="section"><a href="graphicalConfiguration.html">Graphical Configuration</a></span></dt>
+ <dd>
+ <dl>
+ <dt><span class="section"><a href="graphicalConfiguration.html#configureX_chooser">&#26174;&#31034;&#21345;&#21644;&#26174;&#31034;&#22120;&#37197;&#32622;</a></span></dt>
+ <dt><span class="section"><a href="graphicalConfiguration.html#configureX_card_list">&#36873;&#25321;&#19968;&#20010;X&#26381;&#21153;&#22120;(&#37197;&#32622;&#24744;&#30340;&#26174;&#31034;&#21345;)</a></span></dt>
+ <dt><span class="section"><a href="graphicalConfiguration.html#configureX_monitor">&#36873;&#25321;&#24744;&#30340;&#26174;&#31034;&#22120;</a></span></dt>
</dl>
</dd>
- <dt><span class="section"><a href="configureX_chooser.html">&#26174;&#31034;&#21345;&#21644;&#26174;&#31034;&#22120;&#37197;&#32622;</a></span></dt>
- <dt><span class="section"><a href="configureX_card_list.html">&#36873;&#25321;&#19968;&#20010;X&#26381;&#21153;&#22120;(&#37197;&#32622;&#24744;&#30340;&#26174;&#31034;&#21345;)</a></span></dt>
- <dt><span class="section"><a href="configureX_monitor.html">&#36873;&#25321;&#24744;&#30340;&#26174;&#31034;&#22120;</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html">&#24341;&#23548;&#31243;&#24207;&#30340;&#20027;&#35201;&#36873;&#39033;</a></span></dt>
+ <dt><span class="section"><a href="setupBootloader.html">Bootloader</a></span></dt>
<dd>
<dl>
- <dt><span class="section"><a href="setupBootloader.html#d5e874">&#24341;&#23548;&#22120;&#30028;&#38754;</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e898">&#20351;&#29992; Mageia &#25552;&#20379;&#30340;&#24341;&#23548;&#22120;</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e912">&#20351;&#29992;&#29616;&#23384;&#30340;&#24341;&#23548;&#22120;</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e915">&#20351;&#29992;&#38142;&#24335;&#21152;&#36733;&#65288;chain loading&#65289;</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e929">&#36873;&#39033;</a></span></dt>
+ <dt><span class="section"><a href="setupBootloader.html#d5e999">Grub2</a></span></dt>
+ <dt><span class="section"><a href="setupBootloader.html#d5e1014">Bootloader Setup</a></span></dt>
+ <dt><span class="section"><a href="setupBootloader.html#d5e1104">Other Options</a></span></dt>
</dl>
</dd>
- <dt><span class="section"><a href="setupBootloaderAddEntry.html">&#28155;&#21152;&#25110;&#20462;&#25913;&#24341;&#23548;&#33756;&#21333;&#39033;</a></span></dt>
- <dt><span class="section"><a href="misc-params.html">&#19968;&#20123;&#26434;&#39033;</a></span></dt>
+ <dt><span class="section"><a href="misc-params.html">Configuration Summary</a></span></dt>
<dd>
<dl>
<dt><span class="section"><a href="misc-params.html#misc-params-system">&#31995;&#32479;&#21442;&#25968;</a></span></dt>
@@ -92,11 +104,11 @@
<dt><span class="section"><a href="misc-params.html#misc-params-security">&#23433;&#20840;</a></span></dt>
</dl>
</dd>
- <dt><span class="section"><a href="configureTimezoneUTC.html">&#37197;&#32622;&#26102;&#21306;</a></span></dt>
- <dt><span class="section"><a href="selectCountry.html">&#36873;&#25321;&#24744;&#25152;&#22312;&#30340;&#22269;&#23478;/&#22320;&#21306;</a></span></dt>
+ <dt><span class="section"><a href="locale.html">Locale</a></span></dt>
<dd>
<dl>
- <dt><span class="section"><a href="selectCountry.html#inputMethod">&#36755;&#20837;&#27861;</a></span></dt>
+ <dt><span class="section"><a href="locale.html#configureTimezoneUTC">&#37197;&#32622;&#26102;&#21306;</a></span></dt>
+ <dt><span class="section"><a href="locale.html#selectCountry">&#36873;&#25321;&#24744;&#25152;&#22312;&#30340;&#22269;&#23478;/&#22320;&#21306;</a></span></dt>
</dl>
</dd>
<dt><span class="section"><a href="configureServices.html">&#37197;&#32622;&#26381;&#21153;</a></span></dt>
@@ -108,33 +120,16 @@
</dl>
</dd>
<dt><span class="section"><a href="securityLevel.html">&#23433;&#20840;&#32423;&#21035;</a></span></dt>
+ <dt><span class="section"><a href="firewall.html">Firewall</a></span></dt>
<dt><span class="section"><a href="installUpdates.html">&#26356;&#26032;</a></span></dt>
<dt><span class="section"><a href="exitInstall.html">&#24685;&#21916;</a></span></dt>
<dt><span class="section"><a href="uninstall-Mageia.html">&#21368;&#36733;Mageia</a></span></dt>
- <dd>
- <dl>
- <dt><span class="section"><a href="uninstall-Mageia.html#d5e1232">&#22914;&#20309;&#20570;</a></span></dt>
- </dl>
- </dd>
</dl>
</div>
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -152,29 +147,37 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -187,7 +190,6 @@
-
@@ -197,17 +199,20 @@
-
-
-
+
+
+
+
+
+
diff --git a/zh_cn/installUpdates.html b/zh_cn/installUpdates.html
index 48e5b6e..5dec2dc 100644
--- a/zh_cn/installUpdates.html
+++ b/zh_cn/installUpdates.html
@@ -6,7 +6,7 @@
<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
<link rel="home" href="index.html" title="&#29992; DrakX &#23433;&#35013;">
<link rel="up" href="index.html" title="&#29992; DrakX &#23433;&#35013;">
- <link rel="prev" href="securityLevel.html" title="&#23433;&#20840;&#32423;&#21035;">
+ <link rel="prev" href="firewall.html" title="Firewall">
<link rel="next" href="exitInstall.html" title="&#24685;&#21916;"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
<!--
body { font-family: sans-serif; font-size: 13px }
@@ -30,21 +30,43 @@
-
-
- <p><a name="installUpdates-pa1"></a>&#22312;&#27492;&#29256;&#26412;&#30340; <span class="application">Mageia</span> &#21457;&#24067;&#20043;&#21518;&#65292;&#19968;&#20123;&#36719;&#20214;&#21253;&#23558;&#20250;&#34987;&#26356;&#26032;&#25110;&#25913;&#21892;&#12290;
- </p>
-
- <p><a name="installUpdates-pa2"></a>&#33509;&#24744;&#24076;&#26395;&#19979;&#36733;&#21644;&#23433;&#35013;&#26356;&#26032;&#21518;&#30340;&#36719;&#20214;&#21253;&#65292;&#35831;&#36873;&#25321; <span class="guilabel">&#26159;</span>&#65307;&#33509;&#24744;&#19981;&#24076;&#26395;&#36825;&#26679;&#20570;&#65292;&#25110;&#26080;&#27861;&#36830;&#25509;&#21040;&#20114;&#32852;&#32593;&#65292;&#35831;&#36873;&#25321;
- <span class="guilabel">&#21542;</span>&#12290;
- </p>
+
+
+
+
+
- <p><a name="installUpdates-pa3"></a>&#28982;&#21518;&#25353;<span class="guibutton">&#19979;&#19968;&#27493;</span>&#32487;&#32493;
+ <p><a name="installUpdates-pa1"></a>Since this version of Mageia was released, some packages will have been
+ updated or improved.
</p>
+
+ <div class="itemizedlist">
+ <ul class="itemizedlist">
+ <li class="listitem">
+
+ <p><a name="installUpdates-pa2"></a>Select <span class="emphasis"><em>Yes</em></span> if you wish to download and install them
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p>Select <span class="emphasis"><em>No</em></span> if you don't want to do this now, or if you
+ aren't connected to the Internet
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p><a name="installUpdates-pa3"></a>Press <span class="emphasis"><em>Next</em></span> to continue
+ </p>
+
+ </li>
+ </ul>
+ </div>
</div>
</body>
diff --git a/zh_cn/installer.html b/zh_cn/installer.html
index 55564b0..dbb92be 100644
--- a/zh_cn/installer.html
+++ b/zh_cn/installer.html
@@ -22,201 +22,37 @@
</div>
</div>
</div>
-
-
-
-
-
-
- <p>&#26080;&#35770;&#24744;&#26159;&#21018;&#25509;&#35302; GNU-Linux &#30340;&#26032;&#20154;&#65292;&#36824;&#26159;&#32769;&#25163;&#65292;Mageia &#23433;&#35013;&#22120;&#37117;&#33021;&#24110;&#24744;&#36731;&#26494;&#23433;&#35013;&#25110;&#21319;&#32423;&#31995;&#32479;&#12290;</p>
- <p>&#21021;&#22987;&#39029;&#20013;&#26377;&#24456;&#22810;&#36873;&#39033;&#65292;&#23433;&#35013;&#22120;&#23558;&#20250;&#36873;&#25321;&#20854;&#20013;&#30340;&#40664;&#35748;&#39033;&#65288;&#19968;&#33324;&#26159;&#24744;&#25152;&#38656;&#30340;&#65289;&#12290;</p>
-
-
-
-
-
-
- <p>&#22312;&#27492;&#39029;&#20013;&#65292;&#21487;&#20197;&#36827;&#34892;&#33258;&#23450;&#20041;&#35774;&#32622;&#65306;</p>
-
-
- <div class="itemizedlist">
- <ul class="itemizedlist">
- <li class="listitem">
-
- <p>&#25353; F2 &#36873;&#25321;&#35821;&#35328;&#65288;&#20165;&#29992;&#20110;&#23433;&#35013;&#65292;&#21487;&#33021;&#19982;&#31995;&#32479;&#25152;&#36873;&#35821;&#35328;&#26377;&#20986;&#20837;&#65289;&#65288;&#20165;&#29992;&#20110;&#20256;&#32479;&#27169;&#24335;&#65289;&#12290;</p>
-
-
- <p></p>
-
-
-
-
- <p>&#20351;&#29992;&#26041;&#21521;&#38190;&#26469;&#36873;&#25321;&#35821;&#35328;&#65292;&#28982;&#21518;&#25353; Enter &#38190;&#12290;</p>
-
-
- <p>&#27492;&#22788;&#32473;&#20986;&#20102;&#20351;&#29992; Live DVD/CD &#23433;&#35013;&#26102;&#27861;&#35821;&#29256;&#30340;&#27426;&#36814;&#30028;&#38754;&#12290;&#27880;&#24847;&#65292;Live DVD/CD
- &#33756;&#21333;&#20013;&#19981;&#21253;&#25324;&#65306;<span class="guilabel">&#25937;&#25588;&#31995;&#32479;</span>, <span class="guilabel">&#20869;&#23384;&#27979;&#35797;</span> and
- <span class="guilabel">&#30828;&#20214;&#26816;&#27979;&#24037;&#20855;</span>&#12290;
- </p>
-
-
- <p></p>
-
-
-
-
- <p></p>
-
- </li>
- <li class="listitem">
-
- <p>&#25353; F3 &#38190;&#21487;&#20197;&#26356;&#25913;&#23631;&#24149;&#20998;&#36776;&#29575;&#65288;&#20165;&#29992;&#20110;&#20256;&#32479;&#27169;&#24335;&#65289;&#12290;</p>
-
-
-
- </li>
- <li class="listitem">
-
- <p>&#25353; <span class="bold"><strong>F6</strong></span> &#38190;&#65288;&#20256;&#32479;&#27169;&#24335;&#19979;&#65289;&#25110; <span class="bold"><strong>e</strong></span> &#38190;&#65288;UEFI &#27169;&#24335;&#19979;&#65289;&#21487;&#20197;&#28155;&#21152;&#20869;&#26680;&#21442;&#25968;&#12290;
- </p>
-
-
- <p>&#33509;&#23433;&#35013;&#22833;&#36133;&#65292;&#24744;&#21487;&#33021;&#38656;&#35201;&#23581;&#35797;&#20854;&#20182;&#30340;&#36873;&#39033;&#12290;&#25353; F6 &#38190;&#21487;&#20197;&#35843;&#20986; <span class="guilabel">&#24341;&#23548;&#36873;&#39033;</span>&#65292;&#36825;&#37324;&#25552;&#20379;&#20102;&#22235;&#20010;&#36873;&#39033;&#65306;
- </p>
-
-
- <p>- &#40664;&#35748;&#65292;&#21363;&#20351;&#29992;&#40664;&#35748;&#36873;&#39033;&#12290;</p>
-
-
- <p>- &#23433;&#20840;&#35774;&#32622;&#65292;&#20351;&#29992;&#26356;&#23433;&#20840;&#30340;&#36873;&#39033;&#65288;&#21516;&#26102;&#20250;&#22312;&#19968;&#23450;&#31243;&#24230;&#19978;&#38477;&#20302;&#24615;&#33021;&#65289;</p>
-
-
- <p>- &#26080; ACPI&#65288;&#39640;&#32423;&#37197;&#32622;&#19982;&#30005;&#28304;&#25509;&#21475;&#65289;&#65292;&#19981;&#20351;&#29992;&#30005;&#28304;&#31649;&#29702;&#21151;&#33021;</p>
-
-
- <p>- &#26080;&#26412;&#22320; APIC&#65288;&#26412;&#22320;&#39640;&#32423;&#21487;&#32534;&#31243;&#32456;&#31471;&#25511;&#21046;&#22120;&#65289;&#12290;&#33509;&#24744;&#19981;&#38656;&#35201;&#25511;&#21046; CPU &#20013;&#26029;&#65292;&#21487;&#20197;&#36873;&#25321;&#27492;&#36873;&#39033;</p>
-
-
- <p>&#33509;&#36873;&#25321;&#20102;&#36825;&#20123;&#36873;&#39033;&#20043;&#19968;&#65292;&#23558;&#20250;&#21516;&#26102;&#26356;&#25913;<span class="guilabel">&#24341;&#23548;&#36873;&#39033;</span>&#34892;&#20013;&#30340;&#40664;&#35748;&#36873;&#39033;&#12290;
- </p>
-
-
- <div class="note" title="&#27880;&#24847;" style="margin-left: 0.5in; margin-right: 0.5in;">
- <table border="0" summary="Note">
- <tr>
- <td rowspan="2" align="center" valign="top" width="25"><img alt="[&#27880;&#24847;]" src="note.png"></td>
- <th align="left"></th>
- </tr>
- <tr>
- <td align="left" valign="top">
-
- <p>&#22312;&#37096;&#20998; Mageia &#29256;&#26412;&#20013;&#65292;&#20351;&#29992; F6 &#38190;&#36873;&#25321;&#30340;&#36873;&#39033;&#21487;&#33021;&#19981;&#20250;&#22312;<span class="guilabel">&#24341;&#23548;&#36873;&#39033;</span>&#20013;&#20986;&#29616;&#65292;&#20294;&#36825;&#24182;&#19981;&#24433;&#21709;&#36873;&#39033;&#21457;&#25381;&#20316;&#29992;&#12290;
- </p>
-
- </td>
- </tr>
- </table>
- </div>
-
-
-
- </li>
- <li class="listitem">
-
- <p>&#25353; F1 &#38190;&#21487;&#20197;&#28155;&#21152;&#26356;&#22810;&#20869;&#26680;&#21442;&#25968;&#65288;&#20165;&#29992;&#20110;&#20256;&#32479;&#27169;&#24335;&#65289;&#12290;</p>
-
-
- <p>&#25353; F1 &#21487;&#20197;&#25171;&#24320;&#21253;&#21547;&#26356;&#22810;&#36873;&#39033;&#30340;&#26032;&#31383;&#21475;&#12290;&#20351;&#29992;&#26041;&#21521;&#38190;&#21644; Enter &#26469;&#26597;&#30475;&#26356;&#22810;&#32454;&#33410;&#65292;&#25110;&#25353; Esc &#26469;&#36820;&#22238;&#21040;&#27426;&#36814;&#23631;&#24149;&#12290;</p>
-
-
- <p></p>
-
-
-
-
- <p></p>
-
-
- <p>&#26377;&#20851; splash &#36873;&#39033;&#30340;&#32454;&#33410;&#12290;&#25353; Esc &#25110;&#36873;&#25321;
- <span class="guilabel">&#36820;&#22238;&#24341;&#23548;&#36873;&#39033;</span>&#21487;&#20197;&#22238;&#21040;&#36873;&#39033;&#21015;&#34920;&#12290;&#21487;&#20197;&#25163;&#21160;&#23558;&#36825;&#20123;&#36873;&#39033;&#28155;&#21152;&#21040;<span class="guilabel">&#24341;&#23548;&#36873;&#39033;</span> &#34892;&#12290;
- </p>
-
-
-
-
- <p></p>
-
-
- <div class="note" title="&#27880;&#24847;" style="margin-left: 0.5in; margin-right: 0.5in;">
- <table border="0" summary="Note">
- <tr>
- <td rowspan="2" align="center" valign="top" width="25"><img alt="[&#27880;&#24847;]" src="note.png"></td>
- <th align="left"></th>
- </tr>
- <tr>
- <td align="left" valign="top">
-
- <p>&#25353; F2 &#38190;&#21487;&#20197;&#23558;&#24110;&#21161;&#32763;&#35793;&#20026;&#25152;&#36873;&#35821;&#35328;&#12290;</p>
-
- </td>
- </tr>
- </table>
- </div>
-
- </li>
- </ul>
- </div>
-
- <p>&#26377;&#20851;&#20256;&#32479;&#24341;&#23548;&#21644; UEFI &#24341;&#23548;&#30340;&#20869;&#26680;&#36873;&#39033;&#65292;&#35831;&#21442;&#32771;&#65306;<a class="ulink" href="https://wiki.mageia.org/en/How_to_set_up_kernel_options" target="_top">https://wiki.mageia.org/en/How_to_set_up_kernel_options</a>&#12290;
- </p>
- <p>&#27492;&#22788;&#26159;&#20351;&#29992;&#26377;&#32447;&#32593;&#32476;&#23433;&#35013; CD&#65288;Boot.iso &#25110; Boot-Nonfree.iso &#38236;&#20687;&#65289;&#23433;&#35013;&#26102;&#30340;&#40664;&#35748;&#27426;&#36814;&#30028;&#38754;&#65306;</p>
- <p>&#27492;&#22788;&#26080;&#27861;&#25913;&#21464;&#35821;&#35328;&#65292;&#30028;&#38754;&#20013;&#21015;&#20986;&#20102;&#21487;&#29992;&#30340;&#36873;&#39033;&#12290;&#26377;&#20851;&#20351;&#29992;&#26377;&#32447;&#32593;&#32476;&#23433;&#35013; CD &#26469;&#23433;&#35013;&#30340;&#26356;&#22810;&#32454;&#33410;&#65292;&#35831;&#21442;&#32771; <a class="ulink" href="https://wiki.mageia.org/en/Boot.iso_install" target="_top">Mageia Wiki</a>&#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>&#38190;&#30424;&#24067;&#23616;&#20026;&#32654;&#24335;&#38190;&#30424;&#12290;</p>
-
- </td>
- </tr>
- </table>
- </div>
+ <p>&#26080;&#35770;&#24744;&#26159;&#21018;&#25509;&#35302; GNU-Linux &#30340;&#26032;&#20154;&#65292;&#36824;&#26159;&#32769;&#25163;&#65292;Mageia &#23433;&#35013;&#22120;&#37117;&#33021;&#24110;&#24744;&#36731;&#26494;&#23433;&#35013;&#25110;&#21319;&#32423;&#31995;&#32479;&#12290;</p>
<div class="section" title="&#23433;&#35013;&#27493;&#39588;">
<div class="titlepage">
<div>
<div>
- <h3 class="title"><a name="installationSteps"></a>&#23433;&#35013;&#27493;&#39588;
+ <h3 class="title"><a name="d5e261"></a>&#23433;&#35013;&#27493;&#39588;
</h3>
</div>
</div>
@@ -224,29 +60,54 @@
- <p>&#23433;&#35013;&#36807;&#31243;&#34987;&#20998;&#20026;&#22810;&#20010;&#27493;&#39588;&#65292;&#21487;&#20197;&#22312;&#20391;&#36793;&#26639;&#30475;&#21040;&#23433;&#35013;&#36827;&#24230;&#12290;</p>
-
-
- <p>&#27599;&#19968;&#27493;&#21253;&#21547;&#19968;&#20010;&#25110;&#22810;&#20010;&#31383;&#21475;&#65292;&#24182;&#19988;&#21487;&#20351;&#29992;<span class="guibutton">&#39640;&#32423;</span>&#25353;&#38062;&#26597;&#30475;&#19981;&#24120;&#29992;&#30340;&#36873;&#39033;&#12290;
- </p>
-
-
- <p>&#22810;&#25968;&#31383;&#21475;&#20013;&#26377;<span class="guibutton">&#24110;&#21161;</span>&#25353;&#38062;&#65292;&#21487;&#20197;&#25552;&#20379;&#24403;&#21069;&#25805;&#20316;&#30340;&#26377;&#20851;&#35828;&#26126;&#12290;
- </p>
+ <div class="itemizedlist">
+ <ul class="itemizedlist">
+ <li class="listitem">
+
+ <p>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.
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p>Each step has one or more screens, which may also have
+ <span class="emphasis"><em>Advanced</em></span> sections with extra, less commonly required
+ options.
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p>Most screens have <span class="emphasis"><em>Help</em></span> buttons for further details
+ about the particular step.
+ </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="caution" title="&#23567;&#24515;" style="margin-left: 0.5in; margin-right: 0.5in;">
+ <table border="0" summary="Caution">
<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="[&#23567;&#24515;]" src="caution.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>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.
+ </p>
+
+
+ <p>If, in spite of this, you are very sure rebooting is what you want, go to a
+ text terminal by pressing the keys <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>Alt</strong></span>+<span class="keycap"><strong>F2</strong></span> together. After that,
+ press <span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>Alt</strong></span>+<span class="keycap"><strong>Delete</strong></span> together to reboot.
</p>
</td>
@@ -257,11 +118,152 @@
</div>
+ <div class="section" title="&#23433;&#35013;&#27426;&#36814;&#23631;&#24149;">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h3 class="title"><a name="d5e283"></a>&#23433;&#35013;&#27426;&#36814;&#23631;&#24149;
+ </h3>
+ </div>
+ </div>
+ </div>
+
+
+
+ <p>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.
+ </p>
+
+
+ <p>The welcome menu screen has various options, however the default option will
+ start the installer, and is normally all that you will need.
+ </p>
+
+
+ <div class="section" title="Legacy (BIOS) Systems">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h4 class="title"><a name="d5e287"></a>Legacy (BIOS) Systems
+ </h4>
+ </div>
+ </div>
+ </div>
+
+
+
+
+
+ <div class="itemizedlist" title="Menu">
+ <p class="title"><b>Menu</b></p>
+ <ul class="itemizedlist">
+ <li class="listitem">
+
+ <p><span class="bold"><strong>Install Mageia</strong></span></p>
+
+
+ <p>Install Mageia to a hard disk. This is the default option, and will
+ automatically start after a short while unless another option is selected.
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p><span class="bold"><strong>Rescue System</strong></span></p>
+
+
+ <p>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.
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p><span class="bold"><strong>Memory Test</strong></span></p>
+
+
+ <p>Test the installed RAM by performing multiple read and write
+ operations. Reboot to end the test.
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p><span class="bold"><strong>F2: Language</strong></span></p>
+
+
+ <p>Press F2 for alternative languages.</p>
+
+ </li>
+ </ul>
+ </div>
+
+ </div>
+
+
+ <div class="section" title="UEFI Systems">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h4 class="title"><a name="d5e310"></a>UEFI Systems
+ </h4>
+ </div>
+ </div>
+ </div>
+
+
+
+ <p>From this screen, you can access options by pressing <span class="keycap"><strong>e</strong></span> to
+ enter the edit mode. To come back to this screen, press <span class="keycap"><strong>Esc</strong></span>
+ to quit without saving or press <span class="keycap"><strong>F10</strong></span> to save and quit.
+ </p>
+
+
+
+
+ <div class="itemizedlist" title="Menu">
+ <p class="title"><b>Menu</b></p>
+ <ul class="itemizedlist">
+ <li class="listitem">
+
+ <p><span class="bold"><strong>Install:</strong></span> Start the Install process
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p><span class="bold"><strong>Rescue:</strong></span> 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.
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p><span class="bold"><strong>F2: Language:</strong></span> Press <span class="keycap"><strong>F2</strong></span> for
+ alternative languages.
+ </p>
+
+ </li>
+ </ul>
+ </div>
+
+
+ <p>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".
+ </p>
+
+ </div>
+
+ </div>
+
+
<div class="section" title="&#23433;&#35013;&#38382;&#39064;&#21644;&#38382;&#39064;&#35299;&#20915;&#26041;&#26696;">
<div class="titlepage">
<div>
<div>
- <h3 class="title"><a name="installationProblems"></a>&#23433;&#35013;&#38382;&#39064;&#21644;&#38382;&#39064;&#35299;&#20915;&#26041;&#26696;
+ <h3 class="title"><a name="d5e332"></a>&#23433;&#35013;&#38382;&#39064;&#21644;&#38382;&#39064;&#35299;&#20915;&#26041;&#26696;
</h3>
</div>
</div>
@@ -273,7 +275,7 @@
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="noX"></a>&#19981;&#20351;&#29992;&#22270;&#24418;&#30028;&#38754;
+ <h4 class="title"><a name="d5e334"></a>&#19981;&#20351;&#29992;&#22270;&#24418;&#30028;&#38754;
</h4>
</div>
</div>
@@ -285,15 +287,22 @@
<ul class="itemizedlist">
<li class="listitem">
- <p>&#22312;&#21021;&#22987;&#23631;&#24149;&#20043;&#21518;&#65292;&#21487;&#33021;&#26080;&#27861;&#26174;&#31034;&#35821;&#35328;&#36873;&#25321;&#31383;&#21475;&#12290;&#36825;&#20013;&#24773;&#20917;&#21487;&#33021;&#21457;&#29983;&#22312;&#37096;&#20998;&#26174;&#21345;&#21644;&#36739;&#32769;&#30340;&#31995;&#32479;&#20013;&#12290;&#35831;&#23581;&#35797;&#22312;&#25552;&#31034;&#21518;&#36755;&#20837; <code class="code">vgalo</code>
- &#26469;&#20999;&#25442;&#21040;&#36739;&#20302;&#20998;&#36776;&#29575;&#12290;
+ <p>After the initial screen you did not progress to the <span class="emphasis"><em>Language
+ Selection</em></span> screen. This can happen with some graphic cards and
+ older systems. Try using low resolution by typing <span class="command"><strong>vgalo</strong></span>
+ at the prompt.
</p>
</li>
<li class="listitem">
- <p>&#33509;&#30828;&#20214;&#36739;&#32769;&#65292;&#21487;&#33021;&#26080;&#27861;&#20351;&#29992;&#22270;&#24418;&#21270;&#23433;&#35013;&#31243;&#24207;&#12290;&#36825;&#31181;&#24773;&#20917;&#19979;&#65292;&#21487;&#20197;&#23581;&#35797;&#25991;&#26412;&#23433;&#35013;&#27169;&#24335;&#65306;&#22312;&#39318;&#20010;&#27426;&#36814;&#30028;&#38754;&#20013;&#25353; Esc&#65292;&#28982;&#21518;&#25353;
- Enter&#12290;&#22312;&#20986;&#29616;&#30340;&#40657;&#33394;&#23631;&#24149;&#20013;&#65292;&#36755;&#20837;&#8220;text&#8221;&#65292;&#28982;&#21518;&#25353; Enter&#65292;&#21363;&#21487;&#36827;&#20837;&#25991;&#26412;&#23433;&#35013;&#27169;&#24335;&#12290;
+ <p>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 <span class="keycap"><strong>Esc</strong></span> at the <span class="emphasis"><em>Welcome</em></span> screen
+ and confirm with <span class="keycap"><strong>ENTER</strong></span>. You will be presented with a black
+ screen with a <code class="prompt">boot:</code> prompt. Type <span class="command"><strong>text</strong></span>
+ and press <span class="keycap"><strong>ENTER</strong></span> to continue with the installation in text
+ mode.
</p>
</li>
@@ -307,7 +316,7 @@
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="installFreezes"></a>&#23433;&#35013;&#20572;&#27490;
+ <h4 class="title"><a name="d5e349"></a>&#23433;&#35013;&#20572;&#27490;
</h4>
</div>
</div>
@@ -315,8 +324,11 @@
- <p>&#33509;&#31995;&#32479;&#22312;&#23433;&#35013;&#36807;&#31243;&#20013;&#20572;&#27490;&#21709;&#24212;&#65288;&#21345;&#27515;&#65289;&#65292;&#21487;&#33021;&#26159;&#30828;&#20214;&#26816;&#27979;&#36807;&#31243;&#20986;&#29616;&#38382;&#39064;&#12290;&#22312;&#36825;&#31181;&#24773;&#20917;&#19979;&#65292;&#21487;&#20197;&#20808;&#36339;&#36807;&#30828;&#20214;&#26816;&#27979;&#36807;&#31243;&#65306;&#22312;&#21629;&#20196;&#25552;&#31034;&#21518;&#36755;&#20837;
- <code class="code">noauto</code>&#12290;&#27492;&#36873;&#39033;&#20063;&#21487;&#20197;&#19982;&#20854;&#20182;&#36873;&#39033;&#32852;&#21512;&#20351;&#29992;&#12290;
+ <p>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
+ <span class="command"><strong>noauto</strong></span> at the prompt. This option may also be combined
+ with other parameters as necessary.
</p>
</div>
@@ -326,7 +338,7 @@
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="kernelOptions"></a>&#20869;&#23384;&#38382;&#39064;
+ <h4 class="title"><a name="d5e353"></a>&#20869;&#23384;&#38382;&#39064;
</h4>
</div>
</div>
@@ -334,8 +346,11 @@
- <p>&#37096;&#20998;&#24773;&#20917;&#19979;&#65292;&#30828;&#20214;&#21487;&#33021;&#26080;&#27861;&#27491;&#30830;&#22320;&#26816;&#27979;&#21487;&#29992; RAM &#22823;&#23567;&#12290;&#35201;&#25163;&#21160;&#25351;&#23450;&#23427;&#65292;&#21487;&#20197;&#20351;&#29992; <code class="code">mem=xxxM</code> &#21442;&#25968;&#65292;&#20854;&#20013; xxx &#26159; RAM
- &#30340;&#24635;&#22823;&#23567;&#12290;&#20363;&#22914;&#65292;<code class="code">mem=256M</code> &#34920;&#31034; RAM &#30340;&#22823;&#23567;&#20026; 256MB&#12290;
+ <p>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 class="literal">mem=<em class="replaceable"><code>xxx</code></em>M</code> parameter, where
+ <em class="replaceable"><code>xxx</code></em> is the correct amount of
+ RAM. e.g. <code class="literal">mem=256M</code> would specify 256MB of RAM.
</p>
</div>
@@ -345,7 +360,7 @@
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="DynamicPartitions"></a>&#21160;&#24577;&#20998;&#21306;
+ <h4 class="title"><a name="d5e360"></a>&#21160;&#24577;&#20998;&#21306;
</h4>
</div>
</div>
@@ -353,8 +368,10 @@
- <p>&#33509;&#24744;&#22312;&#24494;&#36719; Windows &#20013;&#23558;&#30828;&#30424;&#20174;&#8220;basic&#8221;&#26684;&#24335;&#36716;&#21464;&#20026;&#8220;dynamic&#8221;&#26684;&#24335;&#65292;&#35813;&#30828;&#30424;&#23558;&#26080;&#27861;&#29992;&#20110; Mageia
- &#23433;&#35013;&#12290;&#35201;&#23558;&#30828;&#30424;&#36716;&#21464;&#22238;&#8220;basic&#8221;&#26684;&#24335;&#65292;&#35831;&#21442;&#35265;&#24494;&#36719;&#30340;&#25991;&#26723;&#65306;<a class="ulink" href="http://msdn.microsoft.com/en-us/library/cc776315.aspx" target="_top">http://msdn.microsoft.com/en-us/library/cc776315.aspx</a>&#12290;
+ <p>If you converted your hard disk from <code class="literal">Basic</code> format to
+ <code class="literal">Dynamic</code> format in Microsoft Windows, then it is not
+ possible to install Mageia on this disc. To revert to a
+ <code class="literal">Basic</code> disk, see the Microsoft documentation: <a class="ulink" href="http://msdn.microsoft.com/en-us/library/cc776315.aspx" target="_top">http://msdn.microsoft.com/en-us/library/cc776315.aspx</a>.
</p>
</div>
diff --git a/zh_cn/locale.html b/zh_cn/locale.html
new file mode 100644
index 0000000..cb651c8
--- /dev/null
+++ b/zh_cn/locale.html
@@ -0,0 +1,196 @@
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+ <title>Locale</title>
+ <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+ <link rel="home" href="index.html" title="&#29992; DrakX &#23433;&#35013;">
+ <link rel="up" href="index.html" title="&#29992; DrakX &#23433;&#35013;">
+ <link rel="prev" href="misc-params.html" title="Configuration Summary">
+ <link rel="next" href="configureServices.html" title="&#37197;&#32622;&#26381;&#21153;"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
+ <!--
+ body { font-family: sans-serif; font-size: 13px }
+ table { font-family: sans-serif; font-size: 13px }
+ --></style></head>
+ <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+ <div lang="zh_CN" class="section" title="Locale">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h2 class="title"><a name="locale"></a>Locale
+ </h2>
+ </div>
+ </div>
+ </div>
+
+
+
+ <div lang="zh_CN" class="section" title="&#37197;&#32622;&#26102;&#21306;">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h3 class="title"><a name="configureTimezoneUTC"></a>&#37197;&#32622;&#26102;&#21306;
+ </h3>
+ </div>
+ </div>
+ </div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <div class="itemizedlist">
+ <ul class="itemizedlist">
+ <li class="listitem">
+
+ <p><a name="configureTimezoneUTC-pa1"></a>Choose your timezone by choosing your country, or a city close to you in the
+ same timezone.
+ </p>
+
+ </li>
+ </ul>
+ </div>
+
+
+ <p><a name="configureTimezoneUTC-pa2"></a>In the next screen you can choose to set your hardware clock to local time
+ or to GMT, also known as UTC.
+ </p>
+
+
+ <div class="note" title="&#27880;&#24847;" style="margin-left: 0.5in; margin-right: 0.5in;">
+ <table border="0" summary="Note">
+ <tr>
+ <td rowspan="2" align="center" valign="top" width="25"><img alt="[&#27880;&#24847;]" src="note.png"></td>
+ <th align="left"></th>
+ </tr>
+ <tr>
+ <td align="left" valign="top">
+
+ <p><a name="configureTimezoneUTC-pa3"></a>&#33509;&#24744;&#23433;&#35013;&#20102;&#22810;&#20010;&#25805;&#20316;&#31995;&#32479;&#65292;&#35831;&#30830;&#20445;&#30828;&#20214;&#26102;&#38047;&#22343;&#34987;&#35774;&#20026;&#26412;&#22320;&#26102;&#38388;&#65292;&#25110;&#22343;&#20026; UTC/GMT&#12290;
+ </p>
+
+ </td>
+ </tr>
+ </table>
+ </div>
+
+ </div>
+
+
+ <div lang="zh_CN" class="section" title="&#36873;&#25321;&#24744;&#25152;&#22312;&#30340;&#22269;&#23478;/&#22320;&#21306;">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h3 class="title"><a name="selectCountry"></a>&#36873;&#25321;&#24744;&#25152;&#22312;&#30340;&#22269;&#23478;/&#22320;&#21306;
+ </h3>
+ </div>
+ </div>
+ </div>
+
+
+
+
+
+
+
+
+
+
+
+ <div class="itemizedlist">
+ <ul class="itemizedlist">
+ <li class="listitem">
+
+ <p><a name="selectCountry-pa1"></a>Select your country or region. This is important for all kinds of settings,
+ like the currency and wireless regulatory domain. Setting the wrong country
+ can lead to being unable to use a Wireless network.
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p><a name="selectCountry-pa2"></a>If your country isn't in the list, click the <span class="emphasis"><em>Other
+ Countries</em></span> option and choose your country / region there.
+ </p>
+
+ </li>
+ </ul>
+ </div>
+
+
+ <div class="note" title="&#27880;&#24847;" style="margin-left: 0.5in; margin-right: 0.5in;">
+ <table border="0" summary="Note">
+ <tr>
+ <td rowspan="2" align="center" valign="top" width="25"><img alt="[&#27880;&#24847;]" src="note.png"></td>
+ <th align="left"></th>
+ </tr>
+ <tr>
+ <td align="left" valign="top">
+
+ <p><a name="selectCountry-pa3"></a>If your country is only in the <span class="emphasis"><em>Other Countries</em></span> list,
+ after clicking <span class="emphasis"><em>OK</em></span> it may seem that a country from the
+ main list was chosen. Despite this, DrakX will actually apply your choice.
+ </p>
+
+ </td>
+ </tr>
+ </table>
+ </div>
+
+
+ <div class="section" title="&#36755;&#20837;&#27861;">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h4 class="title"><a name="inputMethod"></a>&#36755;&#20837;&#27861;
+ </h4>
+ </div>
+ </div>
+ </div>
+
+
+
+ <p><a name="selectCountry-pa4"></a>In the <span class="emphasis"><em>Other Countries</em></span> screen you can also select an
+ input method (at the bottom of the list). Input methods allow users to input
+ multilingual characters (Chinese, Japanese, Korean, etc). IBus is the
+ default input method, so users should not need to configure it
+ manually. Other input methods (SCIM, GCIN, HIME, etc) also provide similar
+ functions and can be installed if you added HTTP/FTP media before package
+ selection.
+ </p>
+
+
+ <div class="note" title="&#27880;&#24847;" style="margin-left: 0.5in; margin-right: 0.5in;">
+ <table border="0" summary="Note">
+ <tr>
+ <td rowspan="2" align="center" valign="top" width="25"><img alt="[&#27880;&#24847;]" src="note.png"></td>
+ <th align="left"></th>
+ </tr>
+ <tr>
+ <td align="left" valign="top">
+
+ <p><a name="selectCountry-pa5"></a>If you missed the input method setup during installation, you can access it
+ post-install via <span class="guimenu">Configure your Computer</span> &#8594; <span class="guimenuitem">System</span>, or by running
+ <span class="command"><strong>localedrake</strong></span> as <span class="emphasis"><em>root</em></span>.
+ </p>
+
+ </td>
+ </tr>
+ </table>
+ </div>
+
+ </div>
+
+ </div>
+
+ </div>
+ </body>
+</html>
diff --git a/zh_cn/misc-params.html b/zh_cn/misc-params.html
index 0cb74b7..c60bec7 100644
--- a/zh_cn/misc-params.html
+++ b/zh_cn/misc-params.html
@@ -2,35 +2,47 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>&#19968;&#20123;&#26434;&#39033;</title>
+ <title>Configuration Summary</title>
<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
<link rel="home" href="index.html" title="&#29992; DrakX &#23433;&#35013;">
<link rel="up" href="index.html" title="&#29992; DrakX &#23433;&#35013;">
- <link rel="prev" href="setupBootloaderAddEntry.html" title="&#28155;&#21152;&#25110;&#20462;&#25913;&#24341;&#23548;&#33756;&#21333;&#39033;">
- <link rel="next" href="configureTimezoneUTC.html" title="&#37197;&#32622;&#26102;&#21306;"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
+ <link rel="prev" href="setupBootloader.html" title="Bootloader">
+ <link rel="next" href="locale.html" title="Locale"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
<!--
body { font-family: sans-serif; font-size: 13px }
table { font-family: sans-serif; font-size: 13px }
--></style></head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
- <div lang="zh_CN" class="section" title="&#19968;&#20123;&#26434;&#39033;">
+ <div lang="zh_CN" class="section" title="Configuration Summary">
<div class="titlepage">
<div>
<div>
- <h2 class="title"><a name="misc-params"></a>&#19968;&#20123;&#26434;&#39033;
+ <h2 class="title"><a name="misc-params"></a>Configuration Summary
</h2>
</div>
</div>
</div>
+
+
+
+
- <p><a name="misc-params-pa1"></a>DrakX &#20250;&#26681;&#25454;&#24744;&#30340;&#36873;&#25321;&#20197;&#21450;&#26816;&#27979;&#21040;&#30340;&#30828;&#20214;&#33258;&#21160;&#29983;&#25104;&#21512;&#36866;&#30340;&#37197;&#32622;&#12290;&#24744;&#21487;&#20197;&#22312;&#27492;&#22788;&#26816;&#26597;&#25110;&#26356;&#25913;&#23427;&#20204;&#65288;&#28857;&#20987; <span class="guibutton">&#37197;&#32622;</span>
- &#25353;&#38062;&#65289;&#12290;
+
+
+
+
+
+
+ <p><a name="misc-params-pa1"></a>DrakX presents a proposal for the configuration of your system depending on
+ the choices you made and on the hardware detected. You can check the
+ settings here and change them if you want by pressing
+ <span class="emphasis"><em>Configure</em></span>.
</p>
@@ -43,7 +55,9 @@
<tr>
<td align="left" valign="top">
- <p>&#19968;&#33324;&#32780;&#35328;&#65292;&#24744;&#21487;&#20197;&#30452;&#25509;&#20351;&#29992;&#25512;&#33616;&#37197;&#32622;&#65292;&#38500;&#38750;&#24744;&#36935;&#21040;&#20197;&#19979;&#19977;&#31181;&#24773;&#20917;&#65306;</p>
+ <p>As a general rule, it is recommended that you accept the default settings
+ unless:
+ </p>
<div class="itemizedlist">
<ul class="itemizedlist">
<li class="listitem">
@@ -58,7 +72,7 @@
</li>
<li class="listitem">
- <p>&#21518;&#32493;&#31456;&#33410;&#20013;&#25152;&#25552;&#21040;&#30340;&#20854;&#20182;&#24773;&#20917;</p>
+ <p>some other factor mentioned in the detailed sections below is an issue</p>
</li>
</ul>
@@ -86,61 +100,61 @@
<ul class="itemizedlist">
<li class="listitem">
- <p><a name="misc-params-system-pa2"></a><span class="guilabel">&#26102;&#21306;</span></p>
+ <p><a name="misc-params-system-pa2"></a><span class="bold"><strong>Timezone</strong></span></p>
- <p><a name="misc-params-system-pa2a"></a>DrakX &#26681;&#25454;&#24744;&#30340;&#35821;&#35328;&#35774;&#32622;&#33258;&#21160;&#36873;&#25321;&#20102;&#26102;&#21306;&#12290;&#24744;&#20063;&#21487;&#20197;&#25163;&#21160;&#25913;&#21464;&#26102;&#21306;&#12290;&#21442;&#35265; <a class="xref" href="configureTimezoneUTC.html" title="&#37197;&#32622;&#26102;&#21306;">&#8220;&#37197;&#32622;&#26102;&#21306;&#8221;&#19968;&#33410;</a></p>
+ <p><a name="misc-params-system-pa2a"></a>DrakX selects a timezone for you, depending on your preferred language. You
+ can change it if needed. See also <a class="xref" href="locale.html#configureTimezoneUTC" title="&#37197;&#32622;&#26102;&#21306;">Configure Timezone</a></p>
</li>
<li class="listitem">
- <p><a name="misc-params-system-pa3"></a><span class="guilabel">&#22269;&#23478;/&#22320;&#21306;</span></p>
+ <p><a name="misc-params-system-pa3"></a><span class="bold"><strong>Country / Region</strong></span></p>
- <p><a name="misc-params-system-pa3a"></a>&#33509;&#24744;&#19981;&#22312;&#25152;&#36873;&#22269;&#23478;/&#22320;&#21306;&#20013;&#65292;&#35831;&#21153;&#24517;&#23545;&#20854;&#36827;&#34892;&#27491;&#30830;&#35774;&#32622;&#12290;&#21442;&#35265; <a class="xref" href="selectCountry.html" title="&#36873;&#25321;&#24744;&#25152;&#22312;&#30340;&#22269;&#23478;/&#22320;&#21306;">&#8220;&#36873;&#25321;&#24744;&#25152;&#22312;&#30340;&#22269;&#23478;/&#22320;&#21306;&#8221;&#19968;&#33410;</a></p>
+ <p><a name="misc-params-system-pa3a"></a>If the selected country is wrong, it is very important that you correct the
+ setting. See <a class="xref" href="locale.html#selectCountry" title="&#36873;&#25321;&#24744;&#25152;&#22312;&#30340;&#22269;&#23478;/&#22320;&#21306;">Select Country</a></p>
</li>
<li class="listitem">
- <p><a name="misc-params-system-pa4"></a><span class="guilabel">&#24341;&#23548;&#22120;</span></p>
+ <p><a name="misc-params-system-pa4"></a><span class="bold"><strong>Bootloader</strong></span></p>
- <p><a name="misc-params-system-pa4a"></a>DrakX &#20026;&#24341;&#23548;&#22120;&#36827;&#34892;&#20102;&#33258;&#21160;&#35774;&#32622;&#12290;
+ <p><a name="misc-params-system-pa4a"></a>DrakX proposal for the bootloader setting
</p>
- <p><a name="misc-params-system-pa4b"></a>&#38500;&#38750;&#24744;&#25026;&#24471;&#22914;&#20309;&#37197;&#32622; GRUB 2&#65292;&#21542;&#21017;&#35831;&#21247;&#26356;&#25913;&#36825;&#20123;&#37197;&#32622;
- </p>
+ <p><a name="misc-params-system-pa4b"></a>Do not change anything, unless you know how to configure GRUB2. For more
+ information, see <a class="xref" href="setupBootloader.html" title="Bootloader">Bootloader</a></p>
- <p><a name="misc-params-system-pa4c"></a>&#26356;&#22810;&#20449;&#24687;&#65292;&#21442;&#35265; <a class="xref" href="setupBootloader.html" title="&#24341;&#23548;&#31243;&#24207;&#30340;&#20027;&#35201;&#36873;&#39033;">&#8220;&#24341;&#23548;&#31243;&#24207;&#30340;&#20027;&#35201;&#36873;&#39033;&#8221;&#19968;&#33410;</a></p>
+
</li>
<li class="listitem">
- <p><a name="misc-params-system-pa5"></a><span class="guilabel">&#29992;&#25143;&#31649;&#29702;</span></p>
+ <p><a name="misc-params-system-pa5"></a><span class="bold"><strong>User management</strong></span></p>
- <p><a name="misc-params-system-pa5a"></a>&#24744;&#21487;&#20197;&#22312;&#27492;&#22788;&#28155;&#21152;&#39069;&#22806;&#30340;&#29992;&#25143;&#12290;&#23558;&#20250;&#20026;&#27599;&#20010;&#29992;&#25143;&#22312; <code class="literal">/home</code> &#19979;&#21019;&#24314;&#30446;&#24405;&#12290;
+ <p><a name="misc-params-system-pa5a"></a>You can add extra users here. They will each be allocated their own
+ <code class="filename">/home</code> directories.
</p>
</li>
<li class="listitem">
- <p><a name="misc-params-system-pa6"></a><span class="guilabel">&#26381;&#21153;</span>:
- </p>
-
-
- <p><a name="misc-params-system-pa6a"></a>&#31995;&#32479;&#26381;&#21153;&#25351;&#22312;&#21518;&#21488;&#36816;&#34892;&#30340;&#23567;&#31243;&#24207;&#65288;&#23432;&#25252;&#36827;&#31243;&#65289;&#12290;&#27492;&#24037;&#20855;&#20801;&#35768;&#24744;&#21551;&#29992;&#25110;&#31105;&#29992;&#29305;&#23450;&#20219;&#21153;&#12290;
- </p>
+ <p><a name="misc-params-system-pa6"></a><span class="bold"><strong>Services</strong></span></p>
- <p><a name="misc-params-system-pa6b"></a>&#22312;&#20570;&#20986;&#26356;&#25913;&#20043;&#21069;&#65292;&#35831;&#35748;&#30495;&#23457;&#35270;&#36873;&#39033; - &#20219;&#20309;&#38169;&#35823;&#37117;&#21487;&#33021;&#23548;&#33268;&#31995;&#32479;&#26080;&#27861;&#27491;&#24120;&#36816;&#34892;&#12290;
+ <p><a name="misc-params-system-pa6a"></a>System services refer to those small programs which run in the background
+ (daemons). This tool allows you to enable or disable certain processes.
</p>
- <p>&#26356;&#22810;&#20449;&#24687;&#65292;&#21442;&#35265; <a class="xref" href="configureServices.html" title="&#37197;&#32622;&#26381;&#21153;">&#8220;&#37197;&#32622;&#26381;&#21153;&#8221;&#19968;&#33410;</a>.
- </p>
+ <p><a name="misc-params-system-pa6b"></a>You should check carefully before changing anything here - a mistake may
+ prevent your computer from operating correctly. For more information, see
+ <a class="xref" href="configureServices.html" title="&#37197;&#32622;&#26381;&#21153;">Configure Services</a></p>
</li>
</ul>
@@ -165,11 +179,11 @@
<ul class="itemizedlist">
<li class="listitem">
- <p><a name="misc-params-hardware-pa1"></a><span class="guilabel">&#38190;&#30424;</span>:
- </p>
+ <p><a name="misc-params-hardware-pa1"></a><span class="bold"><strong>Keyboard</strong></span></p>
- <p><a name="misc-params-hardware-pa1a"></a>&#22312;&#36825;&#37324;&#65292;&#24744;&#21487;&#20197;&#26681;&#25454;&#24744;&#25152;&#22312;&#30340;&#20301;&#32622;&#12289;&#20351;&#29992;&#30340;&#35821;&#35328;&#21644;&#38190;&#30424;&#31867;&#22411;&#26469;&#35774;&#32622;&#38190;&#30424;&#24067;&#23616;&#12290;
+ <p><a name="misc-params-hardware-pa1a"></a>Configure your keyboard layout according to your location, language and type
+ of keyboard.
</p>
@@ -192,8 +206,7 @@
</li>
<li class="listitem">
- <p><a name="misc-params-hardware-pa2"></a><span class="guilabel">&#40736;&#26631;</span>:
- </p>
+ <p><a name="misc-params-hardware-pa2"></a><span class="bold"><strong>Mouse</strong></span></p>
<p><a name="misc-params-hardware-pa2a"></a>&#24744;&#21487;&#20197;&#28155;&#21152;&#25110;&#37197;&#32622;&#20854;&#20182;&#35302;&#25511;&#35774;&#22791;&#12289;&#24179;&#26495;&#12289;&#36712;&#36857;&#29699;&#31561;&#12290;
@@ -202,27 +215,31 @@
</li>
<li class="listitem">
- <p><a name="misc-params-hardware-pa3"></a><span class="guilabel">&#22768;&#21345;</span>:
+ <p><a name="misc-params-hardware-pa3"></a><span class="bold"><strong>Sound card</strong></span></p>
+
+
+ <p><a name="misc-params-hardware-pa3a"></a>The installer will use the default driver if one is available.
</p>
- <p><a name="misc-params-hardware-pa3a"></a>&#23433;&#35013;&#22120;&#23558;&#20250;&#20351;&#29992;&#40664;&#35748;&#39537;&#21160;&#65288;&#22914;&#26524;&#26377;&#30340;&#35805;&#65289;&#12290;&#21482;&#26377;&#23384;&#22312;&#22810;&#20010;&#21487;&#29992;&#39537;&#21160;&#65288;&#19988;&#22343;&#19981;&#26159;&#40664;&#35748;&#39537;&#21160;&#65289;&#26102;&#65292;&#25165;&#20250;&#25552;&#31034;&#24744;&#36827;&#34892;&#36873;&#25321;&#12290;
+ <p>If there is no actual default driver for your sound card, there may be other
+ possible alternative drivers available to choose from. If this is the case,
+ but you think the installer has not made the most appropriate choice, you
+ can click on <span class="emphasis"><em>Advanced</em></span> to manually specify a driver.
</p>
</li>
<li class="listitem">
- <p><a name="misc-params-hardware-pa4"></a><span class="guilabel">&#22270;&#24418;&#30028;&#38754;</span>:
- </p>
+ <p><a name="misc-params-hardware-pa4"></a><span class="bold"><strong>Graphical interface</strong></span></p>
- <p><a name="misc-params-hardware-pa4a"></a>&#24744;&#21487;&#20197;&#22312;&#36825;&#37324;&#37197;&#32622;&#26174;&#21345;&#21644;&#26174;&#31034;&#22120;&#12290;
- </p>
+ <p><a name="misc-params-hardware-pa4a"></a>This section allows you to configure your graphics card(s) and displays. For
+ more information, see <a class="xref" href="graphicalConfiguration.html#configureX_chooser" title="&#26174;&#31034;&#21345;&#21644;&#26174;&#31034;&#22120;&#37197;&#32622;">&#8220;&#26174;&#31034;&#21345;&#21644;&#26174;&#31034;&#22120;&#37197;&#32622;&#8221;&#19968;&#33410;</a></p>
- <p><a name="misc-params-hardware-pa4b"></a>&#26356;&#22810;&#20449;&#24687;&#65292;&#21442;&#35265; <a class="xref" href="configureX_chooser.html" title="&#26174;&#31034;&#21345;&#21644;&#26174;&#31034;&#22120;&#37197;&#32622;">&#8220;&#26174;&#31034;&#21345;&#21644;&#26174;&#31034;&#22120;&#37197;&#32622;&#8221;&#19968;&#33410;</a>.
- </p>
+
</li>
</ul>
</div>
@@ -248,11 +265,13 @@
<ul class="itemizedlist">
<li class="listitem">
- <p><a name="misc-params-network-pa1"></a><span class="guilabel">&#32593;&#32476;</span>:
- </p>
+ <p><a name="misc-params-network-pa1"></a><span class="bold"><strong>Network</strong></span></p>
- <p><a name="misc-params-network-pa2"></a>&#24744;&#21487;&#20197;&#22312;&#36825;&#37324;&#37197;&#32622;&#32593;&#32476;&#12290;&#33509;&#24744;&#38656;&#35201;&#22312;&#32593;&#21345;&#19978;&#20351;&#29992;&#38750;&#33258;&#30001;&#30340;&#39537;&#21160;&#31243;&#24207;&#65292;&#24182;&#19988;&#23578;&#26410;&#21551;&#29992; Nonfree &#36719;&#20214;&#20179;&#24211;&#65292;&#37027;&#20040;&#24744;&#26368;&#22909;&#31561;&#21040;&#37325;&#21551;&#21518;&#20877;&#36827;&#34892;&#36825;&#19968;&#25805;&#20316;&#12290;
+ <p><a name="misc-params-network-pa2"></a>You can configure your network here, but for network cards with non-free
+ drivers it is better to do that after reboot, using the Mageia Control
+ Center, if you have not yet enabled the <span class="emphasis"><em>Nonfree</em></span> media
+ repositories.
</p>
@@ -265,7 +284,8 @@
<tr>
<td align="left" valign="top">
- <p><a name="misc-params-network-pa3"></a>&#24403;&#24744;&#28155;&#21152;&#20102;&#32593;&#21345;&#21518;&#65292;&#35831;&#19981;&#35201;&#24536;&#35760;&#29992;&#38450;&#28779;&#22681;&#23545;&#35813;&#25509;&#21475;&#36827;&#34892;&#31649;&#29702;&#12290;
+ <p><a name="misc-params-network-pa3"></a>When you add a network card, do not forget to set your firewall to monitor
+ that interface as well.
</p>
</td>
@@ -276,15 +296,17 @@
</li>
<li class="listitem">
- <p><a name="misc-params-network-pa4"></a><span class="guilabel">&#20195;&#29702;</span>&#65306;
- </p>
+ <p><a name="misc-params-network-pa4"></a><span class="bold"><strong>Proxies</strong></span></p>
- <p><a name="misc-params-network-pa4a"></a>&#20195;&#29702;&#26381;&#21153;&#22120;&#23558;&#20316;&#20026;&#24744;&#30340;&#30005;&#33041;&#21644;&#24191;&#22495;&#32593;&#20043;&#38388;&#30340;&#26725;&#26753;&#12290;&#24744;&#21487;&#20197;&#22312;&#27492;&#22788;&#37197;&#32622;&#24744;&#38656;&#35201;&#20351;&#29992;&#30340;&#20195;&#29702;&#26381;&#21153;&#12290;
+ <p><a name="misc-params-network-pa4a"></a>A Proxy Server acts as an intermediary between your computer and the wider
+ Internet. This section allows you to configure your computer to utilize a
+ proxy service.
</p>
- <p><a name="misc-params-network-pa4b"></a>&#24744;&#21487;&#33021;&#38656;&#35201;&#21672;&#35810;&#31995;&#32479;&#31649;&#29702;&#21592;&#26469;&#33719;&#21462;&#27492;&#22788;&#24212;&#24403;&#22635;&#20889;&#30340;&#21442;&#25968;
+ <p><a name="misc-params-network-pa4b"></a>You may need to consult your systems administrator to obtain the parameters
+ you need to enter here.
</p>
</li>
@@ -310,29 +332,35 @@
<ul class="itemizedlist">
<li class="listitem">
- <p><a name="misc-params-security-pa1"></a><span class="guilabel">&#23433;&#20840;&#31561;&#32423;</span>&#65306;
- </p>
-
-
- <p><a name="misc-params-security-pa1a"></a>&#24744;&#21487;&#20197;&#22312;&#36825;&#37324;&#35774;&#32622;&#35745;&#31639;&#26426;&#30340;&#23433;&#20840;&#31561;&#32423;&#65292;&#19968;&#33324;&#24773;&#20917;&#19979;&#21487;&#20197;&#20351;&#29992;&#40664;&#35748;&#35774;&#32622;&#65288;&#26631;&#20934;&#65289;&#12290;
- </p>
+ <p><a name="misc-params-security-pa1"></a><span class="bold"><strong>Security Level</strong></span></p>
- <p><a name="misc-params-security-pa1b"></a>&#35831;&#21246;&#36873;&#24744;&#35748;&#20026;&#21512;&#36866;&#30340;&#36873;&#39033;&#12290;
+ <p><a name="misc-params-security-pa1a"></a>The Security level for your computer, in most cases the default setting
+ (Standard) is adequate for general use. Select the option which best suits
+ your usage.
</p>
</li>
<li class="listitem">
- <p><a name="misc-params-security-pa2"></a><span class="guilabel">&#38450;&#28779;&#22681;</span>&#65306;
+ <p><a name="misc-params-security-pa2"></a><span class="bold"><strong>Firewall</strong></span></p>
+
+
+ <p><a name="misc-params-security-pa2b"></a>The firewall allows you to manage which network connections are allowed on
+ your computer. The safe and secure default is to allow ZERO inbound
+ connections. This does not stop you connecting outbound and using your
+ computer normally.
</p>
- <p><a name="misc-params-security-pa2a"></a>&#38450;&#28779;&#22681;&#23558;&#20445;&#25252;&#24744;&#30340;&#37325;&#35201;&#25968;&#25454;&#65292;&#20197;&#20813;&#20854;&#34987;&#20182;&#20154;&#24694;&#24847;&#21033;&#29992;&#25110;&#31363;&#21462;&#12290;
+ <p>Please be aware that the Internet is a high risk network where there are
+ continuous attempts to probe and attack systems. Even seemingly
+ <span class="quote">&#8220;<span class="quote">safe</span>&#8221;</span> connections such as ICMP (for ping) have been used as
+ covert data channels for exfiltrating data by malicious persons.
</p>
- <p><a name="misc-params-security-pa2b"></a>&#36873;&#25321;&#24744;&#38656;&#35201;&#20351;&#29992;&#30340;&#26381;&#21153;&#65292;&#36825;&#21462;&#20915;&#19982;&#24744;&#24076;&#26395;&#22914;&#20309;&#20351;&#29992;&#24744;&#30340;&#35745;&#31639;&#26426;&#12290;&#26377;&#20851;&#26356;&#22810;&#20449;&#24687;&#65292;&#35831;&#21442;&#35265; <a class="xref" href="">???</a>&#12290;
+ <p>For more information, see <a class="xref" href="firewall.html" title="Firewall">Firewall</a>.
</p>
@@ -345,7 +373,8 @@
<tr>
<td align="left" valign="top">
- <p><a name="misc-params-security-pa2c"></a>&#35831;&#29282;&#35760;&#65306;&#20801;&#35768;&#25152;&#26377;&#26381;&#21153;&#65288;&#21363;&#19981;&#21551;&#29992;&#38450;&#28779;&#22681;&#65289;&#26159;&#38750;&#24120;&#21361;&#38505;&#30340;&#12290;
+ <p><a name="misc-params-security-pa2c"></a>Bear in mind that allowing <span class="emphasis"><em>everything</em></span> (no firewall) may
+ be very risky.
</p>
</td>
diff --git a/zh_cn/securityLevel.html b/zh_cn/securityLevel.html
index c851a2e..da41964 100644
--- a/zh_cn/securityLevel.html
+++ b/zh_cn/securityLevel.html
@@ -7,7 +7,7 @@
<link rel="home" href="index.html" title="&#29992; DrakX &#23433;&#35013;">
<link rel="up" href="index.html" title="&#29992; DrakX &#23433;&#35013;">
<link rel="prev" href="soundConfig.html" title="&#22768;&#38899;&#37197;&#32622;">
- <link rel="next" href="installUpdates.html" title="&#26356;&#26032;"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
+ <link rel="next" href="firewall.html" title="Firewall"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
<!--
body { font-family: sans-serif; font-size: 13px }
table { font-family: sans-serif; font-size: 13px }
@@ -30,19 +30,60 @@
+
+
+
+ <p><span class="bold"><strong>Please choose the desired security level</strong></span></p>
-
- <p><a name="securityLevel-pa1"></a>&#24744;&#21487;&#20197;&#22312;&#36825;&#37324;&#35843;&#25972;&#23433;&#20840;&#31561;&#32423;&#12290;
+
+ <p><a name="securityLevel-pa1"></a><span class="emphasis"><em>Standard</em></span> is the default, and recommended setting for
+ the average user.
</p>
-
- <p><a name="securityLevel-pa2"></a>&#33509;&#24744;&#19981;&#30830;&#23450;&#22914;&#20309;&#36873;&#25321;&#65292;&#35831;&#20351;&#29992;&#40664;&#35748;&#35774;&#32622;&#12290;
+
+ <p><span class="emphasis"><em>Secure</em></span> will create a highly protected system - for
+ instance if the system is to be used as a public server.
</p>
-
- <p><a name="securityLevel-pa3"></a>&#22312;&#23433;&#35013;&#20043;&#21518;&#65292;&#24744;&#20063;&#21487;&#20197;&#22312; Mageia &#25511;&#21046;&#20013;&#24515;&#20013;&#30340; <span class="guilabel">&#23433;&#20840;</span> &#36873;&#39033;&#21345;&#37324;&#35843;&#25972;&#23433;&#20840;&#35774;&#32622;&#12290;
+
+ <p><span class="bold"><strong>Security Administrator</strong></span></p>
+
+
+ <p><a name="securityLevel-pa2"></a>This item allows you to configure an email address to which the system will
+ send <span class="emphasis"><em>security alert messages</em></span> when it detects situations
+ which require notification to a system administrator.
</p>
+
+ <p>A good, and easy-to-implement, choice is to enter &lt;user&gt;@localhost -
+ where &lt;user&gt; is the login name of the user to receive these messages.
+ </p>
+
+
+ <div class="note" title="&#27880;&#24847;" style="margin-left: 0.5in; margin-right: 0.5in;">
+ <table border="0" summary="Note">
+ <tr>
+ <td rowspan="2" align="center" valign="top" width="25"><img alt="[&#27880;&#24847;]" src="note.png"></td>
+ <th align="left"></th>
+ </tr>
+ <tr>
+ <td align="left" valign="top">
+
+ <p>The system sends such messages as <span class="bold"><strong>Unix Mailspool
+ messages</strong></span>, not as "ordinary" SMTP mail: this user must therefore
+ be configured for receiving such mail!
+ </p>
+
+ </td>
+ </tr>
+ </table>
+ </div>
+
+
+ <p><a name="securityLevel-pa3"></a>It will always be possible to adjust your security settings post-install in
+ the <span class="emphasis"><em>Security</em></span> section of the Mageia Control Center.
+ </p>
+
</div>
</body>
</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>
diff --git a/zh_cn/selectKeyboard.html b/zh_cn/selectKeyboard.html
index ba2b799..4c1a1bb 100644
--- a/zh_cn/selectKeyboard.html
+++ b/zh_cn/selectKeyboard.html
@@ -7,7 +7,7 @@
<link rel="home" href="index.html" title="&#29992; DrakX &#23433;&#35013;">
<link rel="up" href="index.html" title="&#29992; DrakX &#23433;&#35013;">
<link rel="prev" href="selectInstallClass.html" title="&#26032;&#23433;&#35013;&#25110;&#21319;&#32423;">
- <link rel="next" href="doPartitionDisks.html" title="&#20998;&#21306;"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
+ <link rel="next" href="diskPartitioning.html" title="Partitioning"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
<!--
body { font-family: sans-serif; font-size: 13px }
table { font-family: sans-serif; font-size: 13px }
@@ -28,6 +28,12 @@
+
+
+
+
+
+
<p><a name="selectKeyboard-pa1"></a>DrakX &#20250;&#26681;&#25454;&#24744;&#30340;&#35821;&#35328;&#20026;&#24744;&#36873;&#25321;&#21512;&#36866;&#30340;&#38190;&#30424;&#12290;&#33509;&#25214;&#19981;&#21040;&#21512;&#36866;&#30340;&#38190;&#30424;&#65292;&#21017;&#20250;&#33258;&#21160;&#36873;&#25321;&#32654;&#24335;&#38190;&#30424;&#12290;
</p>
@@ -44,20 +50,25 @@
</li>
<li class="listitem">
- <p><a name="selectKeyboard-pa3"></a>&#33509;&#21015;&#34920;&#20013;&#27809;&#26377;&#24744;&#30340;&#38190;&#30424;&#65292;&#35831;&#28857;&#20987; <span class="guibutton">&#26356;&#22810;</span> &#26469;&#26597;&#30475;&#23436;&#25972;&#21015;&#34920;&#65292;&#24182;&#36873;&#25321;&#30456;&#24212;&#30340;&#38190;&#30424;&#31181;&#31867;&#12290;
+ <p><a name="selectKeyboard-pa3"></a>If your keyboard isn't in the list shown, click on <span class="emphasis"><em>More</em></span>
+ to get a fuller list, and select your keyboard there.
</p>
- <div class="warning" title="&#35686;&#21578;" style="margin-left: 0.5in; margin-right: 0.5in;">
- <table border="0" summary="Warning">
+ <div class="note" title="&#27880;&#24847;" style="margin-left: 0.5in; margin-right: 0.5in;">
+ <table border="0" summary="Note">
<tr>
- <td rowspan="2" align="center" valign="top" width="25"><img alt="[&#35686;&#21578;]" src="warning.png"></td>
+ <td rowspan="2" align="center" valign="top" width="25"><img alt="[&#27880;&#24847;]" src="note.png"></td>
<th align="left"></th>
</tr>
<tr>
<td align="left" valign="top">
- <p><a name="selectKeyboard-pa5"></a>&#22312;&#28857;&#20987; <span class="guibutton">&#30830;&#23450;</span> &#25353;&#38062;&#20043;&#21518;&#65292;&#35831;&#24573;&#30053;&#21069;&#19968;&#20010;&#21015;&#34920;&#20013;&#30340;&#36873;&#39033;&#12290;DrakX &#20250;&#24212;&#29992;&#24744;&#21518;&#26469;&#30340;&#36873;&#25321;&#12290;
+ <p><a name="selectKeyboard-pa5"></a>After choosing a keyboard from the <span class="emphasis"><em>More</em></span> dialogue,
+ you'll return to the first keyboard choice dialogue and it will seem as
+ though a keyboard from that screen was chosen. You can safely ignore this
+ and continue the installation: the keyboard chosen from the full list will
+ be applied.
</p>
</td>
@@ -68,7 +79,9 @@
</li>
<li class="listitem">
- <p><a name="selectKeyboard-pa4"></a>&#33509;&#24744;&#36873;&#25321;&#20102;&#22522;&#20110;&#38750;&#25289;&#19969;&#23383;&#31526;&#30340;&#38190;&#30424;&#24067;&#23616;&#65292;&#20043;&#21518;&#24744;&#23558;&#20250;&#30475;&#21040;&#26377;&#20851;&#20999;&#25442;&#25289;&#19969;/&#38750;&#25289;&#19969;&#38190;&#30424;&#24067;&#23616;&#30340;&#25552;&#31034;&#31383;&#21475;&#12290;
+ <p><a name="selectKeyboard-pa4"></a>If you choose a keyboard based on non-Latin characters, you will see an
+ extra dialogue screen asking how you would prefer to switch between the
+ Latin and non-Latin keyboard layouts
</p>
</li>
diff --git a/zh_cn/selectLanguage.html b/zh_cn/selectLanguage.html
index 81658a3..b01c3ac 100644
--- a/zh_cn/selectLanguage.html
+++ b/zh_cn/selectLanguage.html
@@ -26,7 +26,17 @@
-
+
+
+
+
+
+
+
+
+
+
+
@@ -35,26 +45,46 @@
- <p>&#35831;&#22312;&#22320;&#21306;&#21015;&#34920;&#20013;&#36873;&#25321;&#24744;&#30340;&#39318;&#36873;&#35821;&#35328;&#12290;<span class="application">Mageia</span> &#23558;&#20250;&#22312;&#20043;&#21518;&#30340;&#23433;&#35013;&#36807;&#31243;&#20013;&#20351;&#29992;&#35813;&#35821;&#35328;&#12290;
- </p>
- <p>&#33509;&#24744;&#38656;&#35201;&#22312;&#31995;&#32479;&#20013;&#23433;&#35013;&#22810;&#31181;&#35821;&#35328;&#65288;&#20026;&#24744;&#21644;&#20854;&#20182;&#29992;&#25143;&#65289;&#65292;&#35831;&#29616;&#22312;&#28857;&#20987;<span class="guibutton">&#22810;&#35821;&#35328;</span>&#25353;&#38062;&#26469;&#28155;&#21152;&#35821;&#35328;&#12290;&#23436;&#25104;&#23433;&#35013;&#21518;&#28155;&#21152;&#39069;&#22806;&#35821;&#35328;&#26159;&#30456;&#23545;&#22256;&#38590;&#30340;&#12290;
- </p>
+ <div class="itemizedlist">
+ <ul class="itemizedlist">
+ <li class="listitem">
+
+ <p>Select your preferred language, by first expanding the list for your
+ continent. Mageia will use this selection during the installation and for
+ your installed system.
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p>If it is likely that you (or others) will require several languages to be
+ installed on your system, then you should use the <span class="emphasis"><em>Multiple
+ languages</em></span> option to add them now. It will be difficult to add
+ extra language support after installation.
+ </p>
+
+ </li>
+ </ul>
+ </div>
- <div class="warning" title="&#35686;&#21578;" style="margin-left: 0.5in; margin-right: 0.5in;">
- <table border="0" summary="Warning">
+ <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="[&#35686;&#21578;]" src="warning.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>&#22914;&#26524;&#24744;&#36873;&#25321;&#20102;&#22810;&#31181;&#35821;&#35328;&#65292;&#24517;&#39035;&#21516;&#26102;&#36873;&#25321;&#20854;&#20013;&#19968;&#31181;&#20316;&#20026;&#24744;&#30340;&#39318;&#36873;&#35821;&#35328;&#65288;&#22312;&#21069;&#19968;&#20010;&#35821;&#35328;&#36873;&#25321;&#30028;&#38754;&#20013;&#65289;&#65292;&#35813;&#35821;&#35328;&#20250;&#21516;&#26102;&#20986;&#29616;&#22312;&#22810;&#35821;&#35328;&#37197;&#32622;&#30028;&#38754;&#20013;&#12290;</p>
+ <p>Even if you choose more than one language, you must first choose one as your
+ preferred language from the main list of languages. It will also be marked
+ as chosen in the <span class="emphasis"><em>Multiple languages</em></span> screen.
+ </p>
</td>
</tr>
@@ -66,20 +96,26 @@
<ul class="itemizedlist">
<li class="listitem">
- <p>&#33509;&#24744;&#30340;&#38190;&#30424;&#36755;&#20837;&#35821;&#35328;&#19982;&#39318;&#36873;&#35821;&#35328;&#19981;&#21516;&#65292;&#26368;&#22909;&#20063;&#21516;&#26102;&#23433;&#35013;&#35813;&#36755;&#20837;&#35821;&#35328;&#12290;</p>
+ <p>If your keyboard language is not the same as your preferred language, then
+ it is advisable to install the required language for your keyboard as well
+ </p>
</li>
<li class="listitem">
- <p>Mageia &#40664;&#35748;&#20351;&#29992; UTF-8&#65288;Unicode&#65289;&#26684;&#24335;&#12290;</p>
-
-
- <p>&#33509;&#24744;&#35748;&#20026;&#36825;&#19981;&#36866;&#21512;&#24744;&#30340;&#35821;&#35328;&#65292;&#21487;&#20197;&#22312;&#8220;&#22810;&#35821;&#35328;&#8221;&#30028;&#38754;&#20013;&#23558;&#20854;&#31105;&#29992;&#12290;&#35813;&#25805;&#20316;&#23558;&#24212;&#29992;&#21040;&#25152;&#26377;&#23433;&#35013;&#30340;&#35821;&#35328;&#12290;</p>
+ <p>Mageia uses UTF-8 (Unicode) support by default. This may be disabled in the
+ <span class="emphasis"><em>Multiple languages</em></span> screen if you know that it is
+ inappropriate for your language. Disabling UTF-8 applies to all installed
+ languages.
+ </p>
</li>
<li class="listitem">
- <p>&#24744;&#21487;&#20197;&#22312;&#23433;&#35013;&#23436;&#25104;&#21518;&#65292;&#22312; Mageia &#25511;&#21046;&#20013;&#24515; -&gt; &#31995;&#32479; -&gt; &#31649;&#29702;&#26412;&#22320;&#21270; &#20013;&#25913;&#21464;&#31995;&#32479;&#35821;&#35328;&#12290;</p>
+ <p>You can change the language for your system post-installation in the
+ <span class="guimenu">Mageia Control Center</span> &#8594; <span class="guimenuitem">System</span> &#8594; <span class="guimenuitem">localization for your
+ system</span>.
+ </p>
</li>
</ul>
diff --git a/zh_cn/selectMouse.html b/zh_cn/selectMouse.html
index 93f34b5..700f5d6 100644
--- a/zh_cn/selectMouse.html
+++ b/zh_cn/selectMouse.html
@@ -33,19 +33,22 @@
-
+
+
<p><a name="selectMouse-pa1"></a>&#33509;&#24744;&#23545;&#40736;&#26631;&#30340;&#21709;&#24212;&#36895;&#24230;&#19981;&#28385;&#24847;&#65292;&#21487;&#20197;&#22312;&#36825;&#37324;&#36827;&#34892;&#35843;&#25972;&#12290;
</p>
-
- <p><a name="selectMouse-pa2"></a>&#19968;&#33324;&#32780;&#35328;&#65292;<span class="guilabel">&#36890;&#29992;</span> - <span class="guilabel">&#20219;&#24847; PS/2 &#21644; USB
- &#40736;&#26631;</span>&#21487;&#20197;&#28385;&#36275;&#22823;&#22810;&#25968;&#38656;&#27714;&#12290;
+
+ <p><a name="selectMouse-pa2"></a>Usually, <span class="guimenu">Universal</span> &#8594; <span class="guimenuitem">Any PS/2 and
+ USB mice</span> is a good choice.
</p>
- <p><a name="selectMouse-pa3"></a>&#36873;&#25321; <span class="guilabel">&#36890;&#29992;</span> - <span class="guilabel">&#24378;&#21046; evdev</span> &#21487;&#29992;&#20110;&#37197;&#32622;&#36229;&#36807;&#20116;&#38190;&#30340;&#40736;&#26631;&#12290;
+ <p><a name="selectMouse-pa3"></a>Select <span class="guimenu">Universal</span> &#8594; <span class="guimenuitem">Force
+ evdev</span> to configure the buttons that do not work
+ on a mouse with six or more buttons.
</p>
</div>
diff --git a/zh_cn/setupBootloader.html b/zh_cn/setupBootloader.html
index 08426af..55b5f86 100644
--- a/zh_cn/setupBootloader.html
+++ b/zh_cn/setupBootloader.html
@@ -2,26 +2,38 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>&#24341;&#23548;&#31243;&#24207;&#30340;&#20027;&#35201;&#36873;&#39033;</title>
+ <title>Bootloader</title>
<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
<link rel="home" href="index.html" title="&#29992; DrakX &#23433;&#35013;">
<link rel="up" href="index.html" title="&#29992; DrakX &#23433;&#35013;">
- <link rel="prev" href="configureX_monitor.html" title="&#36873;&#25321;&#24744;&#30340;&#26174;&#31034;&#22120;">
- <link rel="next" href="setupBootloaderAddEntry.html" title="&#28155;&#21152;&#25110;&#20462;&#25913;&#24341;&#23548;&#33756;&#21333;&#39033;"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
+ <link rel="prev" href="graphicalConfiguration.html" title="Graphical Configuration">
+ <link rel="next" href="misc-params.html" title="Configuration Summary"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
<!--
body { font-family: sans-serif; font-size: 13px }
table { font-family: sans-serif; font-size: 13px }
--></style></head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
- <div lang="zh_CN" class="section" title="&#24341;&#23548;&#31243;&#24207;&#30340;&#20027;&#35201;&#36873;&#39033;">
+ <div lang="zh_CN" class="section" title="Bootloader">
<div class="titlepage">
<div>
<div>
- <h2 class="title"><a name="setupBootloader"></a>&#24341;&#23548;&#31243;&#24207;&#30340;&#20027;&#35201;&#36873;&#39033;
+ <h2 class="title"><a name="setupBootloader"></a>Bootloader
</h2>
</div>
</div>
</div>
+
+
+
+
+
+
+
+
+
+
+
+
@@ -29,11 +41,11 @@
- <div class="section" title="&#24341;&#23548;&#22120;&#30028;&#38754;">
+ <div class="section" title="Grub2">
<div class="titlepage">
<div>
<div>
- <h3 class="title"><a name="d5e874"></a>&#24341;&#23548;&#22120;&#30028;&#38754;
+ <h3 class="title"><a name="d5e999"></a>Grub2
</h3>
</div>
</div>
@@ -41,182 +53,61 @@
- <p>&#40664;&#35748;&#24773;&#20917;&#19979;&#65292;Mageia &#20165;&#20351;&#29992;&#65306;</p>
-
-
- <div class="itemizedlist">
+ <div class="itemizedlist" title="Grub2 on Legacy MBR/GPT systems">
+ <p class="title"><b>Grub2 on Legacy MBR/GPT systems</b></p>
<ul class="itemizedlist">
<li class="listitem">
- <p>GRUB2&#65288;&#21253;&#21547;/&#19981;&#21253;&#21547;&#22270;&#24418;&#30028;&#38754;&#65289;&#65292;&#24403;&#20351;&#29992;&#20256;&#32479;&#30828;&#20214; + MBR/GPT&#26684;&#24335;&#20998;&#21306;&#26102;</p>
+ <p>GRUB2 (with or without graphical menu) will be used exclusively as the
+ bootloader for a Legacy/MBR or Legacy/GPT system.
+ </p>
</li>
<li class="listitem">
- <p>GRUB2-efi&#65292;&#24403;&#20351;&#29992; UEFI &#30828;&#20214;&#26102;&#12290;</p>
+ <p>By default, a new bootloader will be written into either the MBR (Master
+ Boot Record) of your first hard drive or in the BIOS boot partition.
+ </p>
</li>
</ul>
</div>
- <div class="tip" title="&#25552;&#31034;" style="margin-left: 0.5in; margin-right: 0.5in;">
- <table border="0" summary="Tip">
- <tr>
- <td rowspan="2" align="center" valign="top" width="25"><img alt="[&#25552;&#31034;]" src="tip.png"></td>
- <th align="left"></th>
- </tr>
- <tr>
- <td align="left" valign="top">
-
- <p>Mageia &#30340;&#22270;&#24418;&#21270;&#33756;&#21333;&#65306;</p>
-
- </td>
- </tr>
- </table>
- </div>
-
-
- <div class="section" title="GRUB2&#65292;&#24403;&#20351;&#29992;&#20256;&#32479;&#30828;&#20214; + MBR/GPT &#26684;&#24335;&#20998;&#21306;&#26102;">
- <div class="titlepage">
- <div>
- <div>
- <h4 class="title"><a name="d5e884"></a>GRUB2&#65292;&#24403;&#20351;&#29992;&#20256;&#32479;&#30828;&#20214; + MBR/GPT &#26684;&#24335;&#20998;&#21306;&#26102;
- </h4>
- </div>
- </div>
- </div>
-
-
-
-
-
- <p>&#33509;&#24744;&#19981;&#30830;&#23450;&#22914;&#20309;&#25805;&#20316;&#65292;&#35831;&#19981;&#35201;&#20462;&#25913;&#8220;&#24341;&#23548;&#35774;&#22791;&#8221;&#12290;</p>
-
- </div>
-
-
- <div class="section" title="GRUB2-efi&#65292;&#24403;&#20351;&#29992; UEFI &#30828;&#20214;&#26102;">
- <div class="titlepage">
- <div>
- <div>
- <h4 class="title"><a name="d5e890"></a>GRUB2-efi&#65292;&#24403;&#20351;&#29992; UEFI &#30828;&#20214;&#26102;
- </h4>
- </div>
- </div>
- </div>
-
-
-
- <p>&#23545;&#20110; UEFI&#65292;&#29992;&#25143;&#30028;&#38754;&#20250;&#31245;&#26377;&#19981;&#21516;&#65292;&#24744;&#23558;&#26080;&#27861;&#36873;&#25321;&#24341;&#23548;&#22120;&#65288;&#22240;&#20026;&#21482;&#33021;&#20351;&#29992; Grub2-efi&#65289;&#12290;</p>
-
-
-
-
- <p>&#22914;&#26524; Mageia &#26159;&#24744;&#22312;&#30005;&#33041;&#19978;&#23433;&#35013;&#30340;&#31532;&#19968;&#20010;&#31995;&#32479;&#65292;&#23433;&#35013;&#31243;&#24207;&#23558;&#33258;&#21160;&#21019;&#24314;&#19968;&#20010; ESP&#65288;EFI &#31995;&#32479;&#20998;&#21306;&#65289;&#26469;&#23481;&#32435;&#24341;&#23548;&#22120;&#65288;Grub2-efi&#65289;&#12290;&#22914;&#26524;&#24050;&#23433;&#35013;&#20102;&#20854;&#20182;
- UEFI &#25805;&#20316;&#31995;&#32479;&#65288;&#20363;&#22914; Windows 8&#65289;&#65292;Mageia &#23433;&#35013;&#22120;&#23558;&#20250;&#25506;&#27979;&#29616;&#23384;&#30340;&#65288;&#30001; Windows &#21019;&#24314;&#30340;&#65289; ESP&#65292;&#24182;&#28155;&#21152;
- grub2-efi&#12290;&#23613;&#31649;&#22810;&#20010; ESP &#21487;&#20197;&#20849;&#23384;&#65292;&#20294;&#21482;&#38656;&#19968;&#20010; ESP &#21363;&#21487;&#28385;&#36275;&#21551;&#21160;&#25152;&#26377;&#25805;&#20316;&#31995;&#32479;&#30340;&#38656;&#27714;&#12290;
- </p>
-
-
- <p>&#33509;&#24744;&#19981;&#30830;&#23450;&#22914;&#20309;&#25805;&#20316;&#65292;&#35831;&#19981;&#35201;&#20462;&#25913;&#8220;&#24341;&#23548;&#35774;&#22791;&#8221;&#12290;</p>
-
- </div>
-
- </div>
-
-
- <div class="section" title="&#20351;&#29992; Mageia &#25552;&#20379;&#30340;&#24341;&#23548;&#22120;">
- <div class="titlepage">
- <div>
- <div>
- <h3 class="title"><a name="d5e898"></a>&#20351;&#29992; Mageia &#25552;&#20379;&#30340;&#24341;&#23548;&#22120;
- </h3>
- </div>
- </div>
- </div>
-
-
-
- <p>&#40664;&#35748;&#24773;&#20917;&#19979;&#65292;&#26681;&#25454;&#24744;&#30340;&#30828;&#20214;&#24773;&#20917;&#65292;Mageia &#20250;&#23558;&#65306;</p>
-
-
- <div class="itemizedlist">
+ <div class="itemizedlist" title="Grub2-efi on UEFI systems">
+ <p class="title"><b>Grub2-efi on UEFI systems</b></p>
<ul class="itemizedlist">
<li class="listitem">
- <p>GRUB 2 &#24341;&#23548;&#22120;&#23433;&#35013;&#33267; MBR&#65288;&#20027;&#24341;&#23548;&#35760;&#24405;&#65289;&#21306;&#22495;&#25110;&#31532;&#19968;&#30828;&#30424;&#30340; BIOS &#24341;&#23548;&#20998;&#21306;&#12290;</p>
+ <p>GRUB2-efi will be used exclusively as the bootloader for a UEFI system.</p>
</li>
<li class="listitem">
- <p>GRUB2-efi &#24341;&#23548;&#22120;&#23433;&#35013;&#33267; ESP</p>
+ <p>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
+ System Partition).
+ </p>
+
+
+ <p>If there are already UEFI-based operating systems installed on your computer
+ (Windows 8 for example), the Mageia installer will detect the existing ESP
+ created by Windows and add grub2-efi to it. If no ESP exists, then one will
+ be created. Although it is possible to have several ESPs, only one is
+ required, whatever the number of operating systems you have.
+ </p>
</li>
</ul>
</div>
-
-
- <p>&#33509;&#24744;&#24050;&#23433;&#35013;&#20102;&#20854;&#20182;&#25805;&#20316;&#31995;&#32479;&#65292;Mageia &#20250;&#23581;&#35797;&#23558;&#23427;&#20204;&#20063;&#28155;&#21152;&#21040; Mageia &#30340;&#24341;&#23548;&#33756;&#21333;&#12290;&#22914;&#26524;&#24744;&#19981;&#24076;&#26395; Mageia
- &#36825;&#20040;&#20570;&#65292;&#35831;&#28857;&#20987;<span class="guibutton">&#19979;&#19968;&#27493;</span>&#65292;&#28982;&#21518;&#21462;&#28040;&#21246;&#36873;<span class="guilabel">&#26816;&#27979;&#20854;&#20182;&#25805;&#20316;&#31995;&#32479;</span></p>
-
-
-
- </div>
-
-
- <div class="section" title="&#20351;&#29992;&#29616;&#23384;&#30340;&#24341;&#23548;&#22120;">
- <div class="titlepage">
- <div>
- <div>
- <h3 class="title"><a name="d5e912"></a>&#20351;&#29992;&#29616;&#23384;&#30340;&#24341;&#23548;&#22120;
- </h3>
- </div>
- </div>
- </div>
-
-
-
- <p>&#26377;&#20851;&#28155;&#21152; Mageia
- &#31995;&#32479;&#33267;&#29616;&#23384;&#24341;&#23548;&#22120;&#30340;&#38382;&#39064;&#36229;&#20986;&#20102;&#27492;&#24110;&#21161;&#30340;&#33539;&#22260;&#12290;&#22810;&#25968;&#24773;&#20917;&#19979;&#65292;&#36825;&#35774;&#35745;&#21040;&#36816;&#34892;&#30456;&#24212;&#30340;&#24341;&#23548;&#22120;&#23433;&#35013;&#31243;&#24207;&#65292;&#24182;&#33258;&#21160;&#26816;&#27979;&#21644;&#28155;&#21152;&#24341;&#23548;&#39033;&#12290;&#35831;&#21442;&#35265;&#26377;&#20851;&#25805;&#20316;&#31995;&#32479;&#30340;&#25991;&#26723;&#20197;&#20415;&#36827;&#19968;&#27493;&#25805;&#20316;&#12290;
- </p>
-
- </div>
-
-
- <div class="section" title="&#20351;&#29992;&#38142;&#24335;&#21152;&#36733;&#65288;chain loading&#65289;">
- <div class="titlepage">
- <div>
- <div>
- <h3 class="title"><a name="d5e915"></a>&#20351;&#29992;&#38142;&#24335;&#21152;&#36733;&#65288;chain loading&#65289;
- </h3>
- </div>
- </div>
- </div>
-
-
-
- <p>&#33509;&#24744;&#19981;&#38656;&#35201; Mageia &#23433;&#35013;&#24341;&#23548;&#22120;&#65292;&#32780;&#26159;&#24076;&#26395;&#20174;&#20854;&#20182;&#31995;&#32479;&#24341;&#23548;
- Mageia&#65292;&#35831;&#28857;&#20987;<span class="guibutton">&#19979;&#19968;&#27493;</span>&#65292;&#28982;&#21518;&#28857;&#20987;<span class="guibutton">&#39640;&#32423;</span>&#24182;&#21246;&#36873;
- <span class="guilabel">&#19981;&#35201;&#20462;&#25913; ESP &#25110; MBR</span>&#12290;
- </p>
-
-
-
-
- <p>&#23433;&#35013;&#31243;&#24207;&#23558;&#20250;&#25552;&#37266;&#24744;&#32570;&#23569;&#24341;&#23548;&#22120;&#65292;&#35831;&#24573;&#30053;&#23427;&#24182;&#28857;&#20987;<span class="guibutton">&#30830;&#23450;</span>&#12290;
- </p>
-
-
</div>
- <div class="section" title="&#36873;&#39033;">
+ <div class="section" title="Bootloader Setup">
<div class="titlepage">
<div>
<div>
- <h3 class="title"><a name="d5e929"></a>&#36873;&#39033;
+ <h3 class="title"><a name="d5e1014"></a>Bootloader Setup
</h3>
</div>
</div>
@@ -224,11 +115,11 @@
- <div class="section" title="&#31532;&#19968;&#39029;">
+ <div class="section" title="&#24341;&#23548;&#31243;&#24207;&#30340;&#20027;&#35201;&#36873;&#39033;">
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="d5e931"></a>&#31532;&#19968;&#39029;
+ <h4 class="title"><a name="d5e1018"></a>&#24341;&#23548;&#31243;&#24207;&#30340;&#20027;&#35201;&#36873;&#39033;
</h4>
</div>
</div>
@@ -236,68 +127,121 @@
+
+
<div class="itemizedlist">
<ul class="itemizedlist">
<li class="listitem">
-
- <p><span class="guilabel">&#33258;&#21160;&#24341;&#23548;&#20043;&#21069;&#31561;&#24453;</span>&#65306;&#27492;&#25991;&#26412;&#26694;&#29992;&#20110;&#35774;&#32622;&#22312;&#31561;&#24453;&#22810;&#23569;&#31186;&#20043;&#21518;&#33258;&#21160;&#36827;&#20837;&#40664;&#35748;&#36873;&#23450;&#30340;&#25805;&#20316;&#31995;&#32479;&#12290;
+
+ <p><span class="bold"><strong>Bootloader to use</strong></span></p>
+
+
+ <p>This feature is only available to Legacy MBR/BIOS systems. Users of UEFI
+ systems will not see this option here.
</p>
+
+ </li>
+ <li class="listitem">
+ <p><span class="bold"><strong>Boot device</strong></span></p>
+
+
+ <p>Don't change this unless you really know what you are doing</p>
+
</li>
<li class="listitem">
-
- <p><span class="guilabel">&#23433;&#20840;</span>&#65306;&#29992;&#20110;&#35774;&#32622;&#24341;&#23548;&#22120;&#30340;&#23494;&#30721;&#12290;&#21487;&#20197;&#38450;&#27490;&#20854;&#20182;&#20154;&#36827;&#20837;&#21333;&#29992;&#25143;&#27169;&#24335;&#65292;&#25110;&#32773;&#20462;&#25913;&#24341;&#23548;&#21442;&#25968;&#12290;
+
+ <p><span class="bold"><strong>Delay before booting the default image</strong></span></p>
+
+
+ <p>This text box lets you set a delay, in seconds, before the default operating
+ system is started up.
</p>
+
+ </li>
+ <li class="listitem">
+
+ <p><span class="bold"><strong>Security</strong></span></p>
+
+ <p>This allows you to set a password for the bootloader. This means a username
+ and password will be required when booting in order to select a booting
+ entry or change settings. This is optional, and most people are not likely
+ to have a need for it. The username is <code class="literal">root</code> and the
+ password is the one chosen hereafter.
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p><span class="bold"><strong>Password</strong></span></p>
+
+
+ <p>Choose a password for the bootloader (optional)</p>
+
</li>
<li class="listitem">
-
- <p><span class="guilabel">&#23494;&#30721;</span>&#65306;&#27492;&#25991;&#26412;&#26694;&#29992;&#20110;&#36755;&#20837;&#23494;&#30721;
+
+ <p><span class="bold"><strong>Password (again)</strong></span></p>
+
+
+ <p>Retype the password and DrakX will check that it matches with the one set
+ above
</p>
+
+ </li>
+ </ul>
+ </div>
+
+
+ <p><span class="emphasis"><em>Advanced</em></span></p>
+
+
+ <div class="itemizedlist">
+ <ul class="itemizedlist">
+ <li class="listitem">
+
+ <p><span class="emphasis"><em>Enable ACPI</em></span></p>
+
+ <p>ACPI (Advanced Configuration and Power Interface) is a standard for power
+ management. It can save energy by stopping unused devices. Deselecting it
+ could be useful if, for example, your computer does not support ACPI or if
+ you think the ACPI implementation might cause some problems (for instance
+ random reboots or system lockups).
+ </p>
+
</li>
<li class="listitem">
-
- <p><span class="guilabel">&#30830;&#35748;&#23494;&#30721;</span>&#65306;&#20877;&#27425;&#36755;&#20837;&#23494;&#30721;&#65292;&#23433;&#35013;&#31243;&#24207;&#23558;&#26816;&#26597;&#24744;&#20004;&#27425;&#36755;&#20837;&#30340;&#23494;&#30721;&#26159;&#21542;&#19968;&#33268;&#12290;
+
+ <p><span class="emphasis"><em>Enable SMP</em></span></p>
+
+
+ <p>This option enables/disables symmetric multiprocessing for multi-core
+ processors
</p>
+
+ </li>
+ <li class="listitem">
+
+ <p><span class="emphasis"><em>Enable APIC</em></span></p>
+
+ <p>Enabling 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.
+ </p>
+
</li>
<li class="listitem">
-
- <p><span class="guilabel">&#39640;&#32423;</span></p>
+
+ <p><span class="emphasis"><em>Enable Local APIC</em></span></p>
-
- <div class="itemizedlist">
- <ul class="itemizedlist">
- <li class="listitem">
-
- <p>ACPI&#65288;&#39640;&#32423;&#37197;&#32622;&#19982;&#30005;&#28304;&#25509;&#21475;&#65289;&#26159;&#26631;&#20934;&#30340;&#30005;&#28304;&#31649;&#29702;&#21327;&#35758;&#12290;&#23427;&#21487;&#20197;&#20851;&#38381;&#26410;&#20351;&#29992;&#30340;&#35774;&#22791;&#20197;&#33410;&#33021;&#65292;&#29992;&#20110;&#21462;&#20195; APM&#12290;&#22914;&#26524;&#24744;&#30340;&#30828;&#20214;&#19981;&#20860;&#23481; ACPI&#65292;&#25110;&#32773;&#24744;&#35748;&#20026; ACPI
- &#20250;&#36896;&#25104;&#26576;&#20123;&#38382;&#39064;&#65288;&#22914;&#20598;&#23572;&#20250;&#33258;&#21160;&#37325;&#21551;&#65292;&#25110;&#31995;&#32479;&#21345;&#27515;&#65289;&#65292;&#21017;&#21487;&#20197;&#21462;&#28040;&#21246;&#36873;&#23427;&#12290;
- </p>
-
- </li>
- <li class="listitem">
-
- <p><span class="guilabel">&#21551;&#29992; SMP</span>&#65306;&#27492;&#36873;&#39033;&#21551;&#29992;&#25110;&#31105;&#29992;&#22810;&#26680;&#22788;&#29702;&#22120;&#19978;&#30340;&#23545;&#31216;&#22810;&#22788;&#29702;&#22120;&#29305;&#24615;&#12290;
- </p>
-
- </li>
- <li class="listitem">
-
- <p><span class="guilabel">&#21551;&#29992; APIC</span>&#65306;&#21551;&#29992;&#25110;&#31105;&#29992;&#39640;&#32423;&#21487;&#32534;&#31243;&#20013;&#26029;&#25511;&#21046;&#22120;&#12290;APIC &#35774;&#22791;&#21487;&#20197;&#25903;&#25345;&#26356;&#22797;&#26434;&#30340;&#20248;&#20808;&#32423;&#27169;&#22411;&#21644;&#39640;&#32423;
- IRQ&#65288;&#20013;&#26029;&#35831;&#27714;&#65289;&#31649;&#29702;&#21151;&#33021;&#12290;
- </p>
-
- </li>
- <li class="listitem">
-
- <p><span class="guilabel">&#21551;&#29992;&#26412;&#22320; APIC</span>&#65306;&#24744;&#21487;&#20197;&#22312;&#36825;&#37324;&#35774;&#32622;&#26412;&#22320; APIC&#65292;&#29992;&#20110;&#22312; SMP &#31995;&#32479;&#20013;&#31649;&#29702;&#26576;&#20010;&#29305;&#23450;&#22788;&#29702;&#22120;&#30340;&#25152;&#26377;&#22806;&#37096;&#20013;&#26029;&#12290;
- </p>
-
- </li>
- </ul>
- </div>
+ <p>Here you can set Local APIC, which manages all external interrupts for a
+ specific processor in an SMP system
+ </p>
+
</li>
</ul>
</div>
@@ -305,11 +249,11 @@
</div>
- <div class="section" title="&#19979;&#19968;&#39029;">
+ <div class="section" title="Bootloader Configuration">
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="d5e962"></a>&#19979;&#19968;&#39029;
+ <h4 class="title"><a name="d5e1068"></a>Bootloader Configuration
</h4>
</div>
</div>
@@ -317,50 +261,175 @@
+
+
<div class="itemizedlist">
<ul class="itemizedlist">
<li class="listitem">
- <p><span class="guilabel">&#40664;&#35748;</span>&#65306;&#20351;&#29992;&#40664;&#35748;&#24341;&#23548;&#21442;&#25968;
+ <p><span class="bold"><strong>Default</strong></span></p>
+
+
+ <p>The operating system to be started up by default.</p>
+
+ </li>
+ <li class="listitem">
+
+ <p><span class="bold"><strong>Append</strong></span></p>
+
+
+ <p>This option lets you pass information to the kernel or tell the kernel to
+ give you more information as it boots.
</p>
</li>
<li class="listitem">
- <p><span class="guilabel">&#36861;&#21152;</span> &#65306;&#29992;&#20110;&#22312;&#40664;&#35748;&#24341;&#23548;&#36873;&#39033;&#21518;&#28155;&#21152;&#39069;&#22806;&#25152;&#38656;&#30340;&#20869;&#26680;&#21442;&#25968;&#12290;
+ <p><span class="bold"><strong>Probe foreign OS</strong></span></p>
+
+
+ <p>If you already have other operating systems installed, Mageia attempts to
+ add them to your new Mageia boot menu. If you don't want this behaviour,
+ then untick the Probe Foreign OS option.
</p>
</li>
+ </ul>
+ </div>
+
+
+ <p><span class="emphasis"><em>Advanced</em></span></p>
+
+
+
+
+ <div class="itemizedlist">
+ <ul class="itemizedlist">
<li class="listitem">
- <p><span class="guilabel">&#25506;&#27979;&#20854;&#20182;&#31995;&#32479;</span>&#65306;&#21442;&#35265;<a class="link" href="setupBootloader.html#setupMageiaBootloader">&#20351;&#29992;
- Mageia &#24341;&#23548;&#22120;</a></p>
+ <p><span class="emphasis"><em>Video mode</em></span></p>
+
+
+ <p>This sets the screen size and colour depth to be used by the boot menu. If
+ you click the down-triangle you will be offered other size and colour depth
+ options.
+ </p>
</li>
<li class="listitem">
- <p><span class="guilabel">&#39640;&#32423;</span></p>
- <div class="itemizedlist">
- <ul class="itemizedlist">
- <li class="listitem">
-
- <p><span class="guilabel">&#22270;&#20687;&#27169;&#24335;</span>&#65306;&#29992;&#20110;&#35774;&#23450;&#26174;&#31034;&#24341;&#23548;&#33756;&#21333;&#26102;&#30340;&#23631;&#24149;&#20998;&#36776;&#29575;&#21644;&#33394;&#24425;&#28145;&#24230;&#12290;&#33509;&#35201;&#20174;&#21487;&#29992;&#30340;&#27169;&#24335;&#20013;&#36827;&#34892;&#36873;&#25321;&#65292;&#35831;&#28857;&#20987;&#19979;&#19977;&#35282;&#26631;&#35760;&#12290;
- </p>
-
- </li>
- <li class="listitem">
-
- <p><span class="bold"><strong>&#19981;&#35201;&#20462;&#25913; ESP &#25110; MBR</strong></span>&#65306;&#21442;&#35265;<a class="link" href="setupBootloader.html#setupChainLoading">&#20351;&#29992;&#38142;&#24335;&#21152;&#36733;</a></p>
-
- </li>
- </ul>
- </div>
+ <p><span class="emphasis"><em>Do not touch ESP or MBR</em></span></p>
+
+
+ <p>Select this option if you don't want a bootable Mageia, but would rather
+ chain-load it from another OS. You will get a warning that the bootloader is
+ missing. Click<span class="emphasis"><em> Ok</em></span> if you are sure you understand the
+ implications, and wish to proceed.
+ </p>
</li>
</ul>
</div>
+
+
+
+ </div>
+
+ </div>
+
+
+ <div class="section" title="Other Options">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h3 class="title"><a name="d5e1104"></a>Other Options
+ </h3>
+ </div>
+ </div>
+ </div>
+
+
+
+ <div class="section" title="&#20351;&#29992;&#29616;&#23384;&#30340;&#24341;&#23548;&#22120;">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h4 class="title"><a name="d5e1106"></a>&#20351;&#29992;&#29616;&#23384;&#30340;&#24341;&#23548;&#22120;
+ </h4>
+ </div>
+ </div>
+ </div>
+
+
+
+ <p>The exact procedure for adding Mageia to an existing bootloader is beyond
+ the scope of this documentation. However in most cases it will involve
+ running the relevant bootloader installation program, which should detect
+ Mageia and automatically add an entry for it in the bootloader menu. See the
+ documentation for the relevant operating system.
+ </p>
</div>
+
+
+ <div class="section" title="Installing Without a Bootloader">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h4 class="title"><a name="d5e1109"></a>Installing Without a Bootloader
+ </h4>
+ </div>
+ </div>
+ </div>
+
+
+
+ <p>While you can opt to install Mageia without a bootloader (see section 2.1
+ Advanced), this is not recommended unless you absolutely know what you are
+ doing, as without some form of bootloader your operating system will be
+ unable to start.
+ </p>
+
+ </div>
+
+
+ <div lang="zh_CN" class="section" title="&#28155;&#21152;&#25110;&#20462;&#25913;&#24341;&#23548;&#33756;&#21333;&#39033;">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h4 class="title"><a name="setupBootloaderAddEntry"></a>&#28155;&#21152;&#25110;&#20462;&#25913;&#24341;&#23548;&#33756;&#21333;&#39033;
+ </h4>
+ </div>
+ </div>
+ </div>
+
+
+
+
+
+ <p>To do this you need to manually edit /boot/grub2/custom.cfg or use the
+ software <span class="bold"><strong>grub-customizer</strong></span> tool instead
+ (available in the Mageia repositories).
+ </p>
+
+
+ <div class="note" title="&#27880;&#24847;" style="margin-left: 0.5in; margin-right: 0.5in;">
+ <table border="0" summary="Note">
+ <tr>
+ <td rowspan="2" align="center" valign="top" width="25"><img alt="[&#27880;&#24847;]" src="note.png"></td>
+ <th align="left"></th>
+ </tr>
+ <tr>
+ <td align="left" valign="top">
+
+ <p>For more information, see: <a class="ulink" href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia" target="_top">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</a></p>
+
+ </td>
+ </tr>
+ </table>
+ </div>
+
+ </div>
</div>
diff --git a/zh_cn/setupSCSI.html b/zh_cn/setupSCSI.html
index 6586f3c..4dcf201 100644
--- a/zh_cn/setupSCSI.html
+++ b/zh_cn/setupSCSI.html
@@ -33,20 +33,27 @@
-
+
+
+
+
+
+
+
-
- <p><a name="setupSCSI-pa1"></a>Drakx &#36890;&#24120;&#20250;&#27491;&#30830;&#25506;&#27979;&#30828;&#30424;&#12290;&#23545;&#20110;&#19968;&#20123;&#36739;&#32769;&#30340; SCSI &#25511;&#21046;&#22120;&#65292;Drakx &#21487;&#33021;&#26080;&#27861;&#30830;&#23450;&#25152;&#38656;&#30340;&#39537;&#21160;&#65292;&#24182;&#22240;&#27492;&#26080;&#27861;&#35782;&#21035;&#23427;&#20204;&#12290;
- </p>
- <p><a name="setupSCSI-pa2"></a>&#22312;&#36825;&#31181;&#24773;&#20917;&#19979;&#65292;&#24744;&#38656;&#35201;&#25163;&#21160;&#35774;&#32622; DrakX &#24212;&#24403;&#20351;&#29992;&#30340; SCSI &#39537;&#21160;&#12290;
+ <p><a name="setupSCSI-pa1"></a>DrakX will normally detect hard disks correctly. However, with some older
+ SCSI controllers it may be unable to determine the correct drivers to use
+ and subsequently fail to recognise the drive.
</p>
- <p><a name="setupSCSI-pa3"></a>&#38543;&#21518; DrakX &#24212;&#24403;&#33021;&#27491;&#30830;&#37197;&#32622;&#36825;&#20123;&#39537;&#21160;&#22120;&#12290;
+ <p><a name="setupSCSI-pa2"></a>If your device is not recognised, you will need to manually tell DrakX which
+ SCSI drive(s) you have. DrakX should then be able to configure the drive(s)
+ correctly.
</p>
</div>
diff --git a/zh_cn/software.html b/zh_cn/software.html
new file mode 100644
index 0000000..9ba6c99
--- /dev/null
+++ b/zh_cn/software.html
@@ -0,0 +1,422 @@
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+ <title>Software</title>
+ <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+ <link rel="home" href="index.html" title="&#29992; DrakX &#23433;&#35013;">
+ <link rel="up" href="index.html" title="&#29992; DrakX &#23433;&#35013;">
+ <link rel="prev" href="diskPartitioning.html" title="Partitioning">
+ <link rel="next" href="addUser.html" title="User Management"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
+ <!--
+ body { font-family: sans-serif; font-size: 13px }
+ table { font-family: sans-serif; font-size: 13px }
+ --></style></head>
+ <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+ <div lang="zh_CN" class="section" title="Software">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h2 class="title"><a name="software"></a>Software
+ </h2>
+ </div>
+ </div>
+ </div>
+
+
+
+
+
+
+ <div class="section" title="Media Selection">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h3 class="title"><a name="d5e703"></a>Media Selection
+ </h3>
+ </div>
+ </div>
+ </div>
+
+
+
+ <div lang="zh_CN" class="section" title="Supplemental Installation Media">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h4 class="title"><a name="add_supplemental_media"></a>Supplemental Installation Media
+ </h4>
+ </div>
+ </div>
+ </div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <p>This screen shows you the list of already recognised repositories. You can
+ add other sources for packages, like an optical-disc or a remote source.
+ The source selection determines which packages will be available during the
+ subsequent steps.
+ </p>
+
+
+ <p>&#22914;&#26524;&#38656;&#35201;&#33719;&#21462;&#32593;&#32476;&#36164;&#28304;&#65292;&#35831;&#25191;&#34892;&#20197;&#19979;&#20004;&#27493;&#65306;</p>
+
+
+ <div class="orderedlist">
+ <ol class="orderedlist" type="1">
+ <li class="listitem">
+
+ <p>Choosing and activating the network, if not already up.</p>
+
+ </li>
+ <li class="listitem">
+
+ <p>Selecting a mirror or specifying a URL (very first entry). By selecting a
+ mirror, you have access to the selection of all repositories managed by
+ Mageia, like the <span class="emphasis"><em>Nonfree</em></span>, the
+ <span class="emphasis"><em>Tainted</em></span> repositories and the
+ <span class="emphasis"><em>Updates</em></span>. With the URL, you can designate a specific
+ repository or your own NFS installation.
+ </p>
+
+ </li>
+ </ol>
+ </div>
+
+
+ <div class="note" title="&#27880;&#24847;" style="margin-left: 0.5in; margin-right: 0.5in;">
+ <table border="0" summary="Note">
+ <tr>
+ <td rowspan="2" align="center" valign="top" width="25"><img alt="[&#27880;&#24847;]" src="note.png"></td>
+ <th align="left"></th>
+ </tr>
+ <tr>
+ <td align="left" valign="top">
+
+ <p>If you are updating a 64-bit installation which may contain some 32-bit
+ packages, it is advised to use this screen to add an online mirror by
+ selecting one of the Network protocols here. The 64-bit DVD ISO only
+ contains 64-bit and <span class="emphasis"><em>noarch</em></span> packages, it will not be
+ able to update the 32-bit packages. However, after adding an online mirror,
+ the installer will find the needed 32-bit packages there.
+ </p>
+
+ </td>
+ </tr>
+ </table>
+ </div>
+
+ </div>
+
+
+ <div lang="zh_CN" class="section" title="Available Media">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h4 class="title"><a name="media_selection"></a>Available Media
+ </h4>
+ </div>
+ </div>
+ </div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <p>&#27492;&#22788;&#21015;&#20986;&#20102;&#21487;&#29992;&#30340;&#20179;&#24211;&#12290;&#26681;&#25454;&#25152;&#36873;&#30340;&#23433;&#35013;&#20171;&#36136;&#65292;&#24182;&#38750;&#25152;&#26377;&#20179;&#24211;&#37117;&#21487;&#20197;&#20351;&#29992;&#12290;&#25152;&#36873;&#20179;&#24211;&#23558;&#20915;&#23450;&#19979;&#19968;&#27493;&#20013;&#21487;&#29992;&#30340;&#36719;&#20214;&#21253;&#12290;</p>
+
+
+ <div class="itemizedlist">
+ <ul class="itemizedlist">
+ <li class="listitem">
+
+ <p><span class="emphasis"><em>Core</em></span> &#20179;&#24211;&#26080;&#27861;&#34987;&#31105;&#29992;&#65292;&#22240;&#20854;&#21253;&#21547;&#21457;&#34892;&#29256;&#20013;&#30340;&#22522;&#30784;&#36719;&#20214;&#12290;
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p>The <span class="emphasis"><em>Nonfree</em></span> repository includes packages that are
+ free-of-charge, i.e. Mageia may redistribute them, but they contain
+ closed-source software (hence the name - Nonfree). For example this
+ repository includes nVidia and AMD graphics card proprietary drivers,
+ firmware for various WiFi cards, etc.
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p>The <span class="emphasis"><em>Tainted</em></span> repository includes packages released under
+ a free license. The main criteria for placing packages in this repository is
+ that they may infringe patents and copyright laws in some countries,
+ e.g. multimedia codecs needed to play various audio/video files; packages
+ needed to play commercial video DVD's, etc.
+ </p>
+
+ </li>
+ </ul>
+ </div>
+
+ </div>
+
+ </div>
+
+
+ <div lang="zh_CN" class="section" title="&#26700;&#38754;&#29615;&#22659;&#36873;&#25321;">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h3 class="title"><a name="chooseDesktop"></a>&#26700;&#38754;&#29615;&#22659;&#36873;&#25321;
+ </h3>
+ </div>
+ </div>
+ </div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <p>Some choices made here will open other screens with related options.</p>
+
+
+ <p>After the selection step(s), you will see a slideshow during the
+ installation of required packages. The slideshow can be disabled by pressing
+ the <span class="emphasis"><em>Details</em></span> button.
+ </p>
+
+
+
+
+ <div class="itemizedlist">
+ <ul class="itemizedlist">
+ <li class="listitem">
+
+ <p>Choose whether you prefer to use the KDE Plasma or GNOME desktop
+ environment. Both come with a full set of useful applications and tools.
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p>Select <span class="emphasis"><em>Custom</em></span> if you do not wish to use either (or,
+ actually use both) of these, or if you want to modify the default software
+ choices for these desktop environments. The LXDE desktop, for instance, is
+ lighter than the previous two, sporting less eye candy and having fewer
+ packages installed by default.
+ </p>
+
+ </li>
+ </ul>
+ </div>
+
+ </div>
+
+
+ <div lang="zh_CN" class="section" title="&#36873;&#25321;&#36719;&#20214;&#21253;&#32452;">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h3 class="title"><a name="choosePackageGroups"></a>&#36873;&#25321;&#36719;&#20214;&#21253;&#32452;
+ </h3>
+ </div>
+ </div>
+ </div>
+
+
+
+
+
+
+
+
+
+ <p>Packages are arranged into common groups, to make choosing what you need on
+ your system a lot easier. The groups are fairly self explanatory, however
+ more information about the content of each is available in tool-tips which
+ become visible as the mouse is hovered over them.
+ </p>
+
+
+ <div class="itemizedlist">
+ <ul class="itemizedlist">
+ <li class="listitem">
+
+ <p><span class="bold"><strong>Workstation</strong></span></p>
+
+ </li>
+ <li class="listitem">
+
+ <p><span class="bold"><strong>Server</strong></span></p>
+
+ </li>
+ <li class="listitem">
+
+ <p><span class="bold"><strong>Graphical Environment</strong></span></p>
+
+ </li>
+ <li class="listitem">
+
+ <p><span class="bold"><strong>Individual Package Selection</strong></span>: you can use
+ this option to manually add or remove packages
+ </p>
+
+ </li>
+ </ul>
+ </div>
+
+
+ <p>See <a class="xref" href="software.html#minimal-install" title="&#26368;&#23567;&#23433;&#35013;">Minimal Install</a> for instructions on how to do a
+ minimal install (without or with X &amp; IceWM).
+ </p>
+
+ </div>
+
+
+ <div lang="zh_CN" class="section" title="&#26368;&#23567;&#23433;&#35013;">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h3 class="title"><a name="minimal-install"></a>&#26368;&#23567;&#23433;&#35013;
+ </h3>
+ </div>
+ </div>
+ </div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <p>Minimal Installation is intended for those with specific uses in mind for
+ Mageia, such as a server or a specialised workstation. You will probably use
+ this option combined with the <span class="emphasis"><em>Individual package
+ selection</em></span> option to fine-tune your installation. See <a class="xref" href="software.html#choosePackagesTree" title="&#36873;&#25321;&#21333;&#20010;&#36719;&#20214;&#21253;">Choose Packages Tree</a>.
+ </p>
+
+
+ <div class="itemizedlist">
+ <ul class="itemizedlist">
+ <li class="listitem">
+
+ <p>You can choose a <span class="emphasis"><em>Minimal Installation</em></span> by de-selecting
+ everything in the <span class="emphasis"><em>Package Group Selection</em></span> screen, see
+ <a class="xref" href="software.html#choosePackageGroups" title="&#36873;&#25321;&#36719;&#20214;&#21253;&#32452;">Choose Package Groups</a>.
+ </p>
+
+
+ <p>If desired, you can additionally tick the <span class="emphasis"><em>Individual package
+ selection</em></span> option in the same screen.
+ </p>
+
+ </li>
+ <li class="listitem">
+
+ <p>If you choose this installation method, then the relevant screen (see
+ screenshot below) will offer you a few useful extras to install, such as
+ documentation and <span class="quote">&#8220;<span class="quote">X</span>&#8221;</span>.
+ </p>
+
+
+ <p>If the <span class="emphasis"><em>With X</em></span> option is selected, then IceWM (a
+ lightweight desktop environment) will also be included.
+ </p>
+
+ </li>
+ </ul>
+ </div>
+
+
+ <p>The basic documentation is provided in the form of <span class="quote">&#8220;<span class="quote">man</span>&#8221;</span> and
+ <span class="quote">&#8220;<span class="quote">info</span>&#8221;</span> pages. It contains the man pages from the <a class="ulink" href="http://www.tldp.org/manpages/man.html" target="_top">Linux Documentation
+ Project</a> and the <a class="ulink" href="http://www.gnu.org/software/coreutils/manual/" target="_top">GNU
+ coreutils</a> info pages.
+ </p>
+
+
+
+ </div>
+
+
+ <div lang="zh_CN" class="section" title="&#36873;&#25321;&#21333;&#20010;&#36719;&#20214;&#21253;">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h3 class="title"><a name="choosePackagesTree"></a>&#36873;&#25321;&#21333;&#20010;&#36719;&#20214;&#21253;
+ </h3>
+ </div>
+ </div>
+ </div>
+
+
+
+
+
+
+
+
+
+
+
+ <p>Here you can add or remove any extra packages to customize your
+ installation.
+ </p>
+
+
+ <p>After having made your choice, you can click on the
+ <span class="emphasis"><em>floppy</em></span> icon at the bottom of the page to save your
+ choice of packages (saving to a USB key works, too). You can then use this
+ file to install the same packages on another system, by pressing the same
+ button during install and choosing to load it.
+ </p>
+
+ </div>
+
+ </div>
+ </body>
+</html>
diff --git a/zh_cn/soundConfig.html b/zh_cn/soundConfig.html
index bfe7d9e..f40cc43 100644
--- a/zh_cn/soundConfig.html
+++ b/zh_cn/soundConfig.html
@@ -26,19 +26,23 @@
-
+
+
+
- <p>&#36825;&#19968;&#30028;&#38754;&#20013;&#21015;&#20986;&#20102;&#23433;&#35013;&#31243;&#24207;&#20026;&#22768;&#21345;&#36873;&#23450;&#30340;&#39537;&#21160;&#65292;&#22914;&#26524;&#26377;&#40664;&#35748;&#39537;&#21160;&#21017;&#23558;&#20854;&#20316;&#20026;&#40664;&#35748;&#37197;&#32622;&#12290;</p>
- <p>&#40664;&#35748;&#39537;&#21160;&#36890;&#24120;&#19981;&#20250;&#20986;&#38382;&#39064;&#12290;&#19981;&#36807;&#65292;&#22914;&#26524;&#24744;&#22312;&#23433;&#35013;&#21518;&#36935;&#21040;&#38382;&#39064;&#65292;&#35831;&#36816;&#34892; <span class="command"><strong>draksound</strong></span>&#65292;&#25110;&#36890;&#36807; MCC&#65288;Mageia
- &#25511;&#21046;&#20013;&#24515;&#65289;&#20013;<span class="guilabel">&#30828;&#20214;</span>&#36873;&#39033;&#21345;&#20013;&#30340;<span class="guilabel">&#22768;&#38899;&#37197;&#32622;</span>&#26469;&#21551;&#21160; draksound&#12290;
+ <p>This screen shows the details of the sound card driver chosen for you by the
+ installer, and this driver should work without problems.
</p>
- <p>&#22312; draksound
- &#25110;&#8220;&#22768;&#38899;&#37197;&#32622;&#8221;&#24037;&#20855;&#30028;&#38754;&#65292;&#28857;&#20987;<span class="guibutton">&#39640;&#32423;</span>&#12289;<span class="guibutton">&#25925;&#38556;&#25490;&#38500;</span>&#26469;&#26597;&#30475;&#35299;&#20915;&#38382;&#39064;&#30340;&#24314;&#35758;&#12290;
+ <p>However, if you encounter any issues post-install, then run
+ <span class="command"><strong>draksound</strong></span> or start this tool via <span class="guimenu">Mageia Control Center</span> &#8594; <span class="guimenuitem">Hardware</span> &#8594; <span class="guimenuitem">Sound Configuration</span>. Then, in the
+ <code class="literal">draksound</code> or <span class="emphasis"><em>Sound Configuration</em></span>
+ screen, click on <span class="emphasis"><em>Troubleshooting</em></span> to find useful advice
+ about how to solve the problem.
</p>
@@ -54,11 +58,10 @@
- <p>&#33509;&#27809;&#26377;&#40664;&#35748;&#39537;&#21160;&#65292;&#25110;&#32773;&#40664;&#35748;&#39537;&#21160;&#36873;&#25321;&#38169;&#35823;&#65292;&#21017;&#21487;&#20197;&#23433;&#35013;&#26102;&#28857;&#20987;&#27492;&#30028;&#38754;&#20013;&#30340;<span class="guibutton">Advanced</span>&#26469;&#26356;&#27491;&#12290;
- </p>
-
-
- <p>`&#22312;&#36825;&#31181;&#24773;&#20917;&#19979;&#65292;&#24744;&#21487;&#20197;&#22312;&#28857;&#20987;<span class="guibutton">&#35753;&#25105;&#36873;&#25321;&#20219;&#24847;&#39537;&#21160;</span>&#26469;&#36873;&#25321;&#20854;&#20182;&#39537;&#21160;&#31243;&#24207;&#12290;
+ <p>If there is no actual default driver for your sound card, there may be other
+ possible alternative drivers available to choose from. If this is the case,
+ but you think the installer has not made the most appropriate choice, you
+ can click on <span class="emphasis"><em>Advanced</em></span> to manually specify a driver.
</p>
</div>
diff --git a/zh_cn/uninstall-Mageia.html b/zh_cn/uninstall-Mageia.html
index df91667..104310c 100644
--- a/zh_cn/uninstall-Mageia.html
+++ b/zh_cn/uninstall-Mageia.html
@@ -24,43 +24,46 @@
+
- <div class="section" title="&#22914;&#20309;&#20570;">
- <div class="titlepage">
- <div>
- <div>
- <h3 class="title"><a name="d5e1232"></a>&#22914;&#20309;&#20570;
- </h3>
- </div>
- </div>
- </div>
-
-
-
- <p>&#33509; Mageia &#26410;&#33021;&#32473;&#24744;&#25552;&#20379;&#33391;&#22909;&#20307;&#39564;&#65292;&#25110;&#24744;&#26410;&#33021;&#27491;&#30830;&#23433;&#35013;&#31995;&#32479;&#65292;Mageia &#20801;&#35768;&#24744;&#21368;&#36733;&#23427;&#12290;&#36825;&#19968;&#21151;&#33021;&#21487;&#19981;&#26159;&#25152;&#26377;&#25805;&#20316;&#31995;&#32479;&#37117;&#20250;&#25552;&#20379;&#30340;&#65281;</p>
-
-
- <p>&#22312;&#22791;&#20221;&#24744;&#30340;&#25968;&#25454;&#21518;&#65292;&#35831;&#29992; Mageia &#23433;&#35013; DVD &#37325;&#26032;&#24341;&#23548;&#31995;&#32479;&#65292;&#24182;&#36827;&#20837;&#25937;&#25588;&#31995;&#32479;&#65292;&#36873;&#25321;&#24674;&#22797; Windows &#24341;&#23548;&#22120;&#65288;Restore Windows
- boot loader&#65289;&#12290;&#20877;&#27425;&#37325;&#21551;&#21518;&#65292;&#24744;&#23558;&#21482;&#33021;&#36827;&#20837; Windows &#31995;&#32479;&#12290;
- </p>
-
-
- <p>&#33509;&#35201;&#23558;&#34987; Mageia &#20351;&#29992;&#30340;&#31354;&#38388;&#37325;&#26032;&#29992;&#20110; Windows&#65292;&#35831;&#28857;&#20987; <code class="code">&#24320;&#22987; -&gt; &#25511;&#21046;&#38754;&#21253; -&gt; &#31649;&#29702;&#24037;&#20855; -&gt; &#35745;&#31639;&#26426;&#31649;&#29702; -&gt; &#23384;&#20648; -&gt;
- &#30913;&#30424;&#31649;&#29702;</code>&#12290;&#25317;&#26377; <span class="guilabel">&#26410;&#30693;</span> &#31867;&#22411;&#30340;&#20998;&#21306;&#21363;&#20026; Mageia
- &#20998;&#21306;&#65292;&#20854;&#22823;&#23567;&#21644;&#20301;&#32622;&#24212;&#24403;&#19982;&#24744;&#23433;&#35013;&#26102;&#25351;&#23450;&#30340;&#19968;&#33268;&#12290;&#21491;&#38190;&#28857;&#20987;&#36825;&#20123;&#20998;&#21306;&#65292;&#24182;&#36873;&#25321; <span class="guibutton">&#21024;&#38500;</span>&#65292;&#21363;&#21487;&#37322;&#25918;&#36825;&#20123;&#20998;&#21306;&#21344;&#29992;&#30340;&#31354;&#38388;&#12290;
- </p>
-
-
- <p>&#33509;&#24744;&#23433;&#35013;&#20102; Windows XP&#65292;&#24744;&#21487;&#20197;&#20351;&#29992;&#31354;&#38386;&#31354;&#38388;&#21019;&#24314;&#19968;&#20010;&#26032;&#20998;&#21306;&#24182;&#26684;&#24335;&#21270;&#23427;&#65288;FAT32 &#25110; NTFS&#65289;&#65292;&#31995;&#32479;&#23558;&#33258;&#21160;&#20026;&#20854;&#20998;&#37197;&#19968;&#20010;&#30424;&#31526;&#12290;</p>
-
-
- <p>&#33509;&#24744;&#21516;&#26102;&#23433;&#35013;&#20102; Windows Vista &#25110; Windows 7&#65292;&#24744;&#36824;&#21487;&#20197;&#25193;&#23637;&#29616;&#23384;&#20998;&#21306;&#30340;&#22823;&#23567;&#12290;&#24744;&#20063;&#21487;&#20197;&#20351;&#29992;&#20854;&#20182;&#20998;&#21306;&#24037;&#20855;&#65292;&#22914;
- gparted&#65288;Windows &#21644; Linux &#19979;&#22343;&#30001;&#23545;&#24212;&#29256;&#26412;&#65289;&#12290;&#35760;&#20303;&#65306;&#22312;&#35843;&#25972;&#20998;&#21306;&#26102;&#65292;&#35831;&#22810;&#21152;&#23567;&#24515;&#65292;&#24182;&#30830;&#20445;&#25152;&#26377;&#37325;&#35201;&#30340;&#25968;&#25454;&#22343;&#20197;&#22791;&#20221;&#12290;
- </p>
-
- </div>
+
+
+ <p>If Mageia didn't convince you or you can't install it correctly - in short
+ you want get rid of it - that is your right and Mageia also gives you the
+ possibility to uninstall. This is not true for every operating system.
+ </p>
+
+
+ <p>After backing up your data, reboot your Mageia installation DVD and select
+ <span class="emphasis"><em>Rescue system</em></span>, then <span class="emphasis"><em>Restore Windows boot
+ loader</em></span>. At the next boot, you will only have Windows, with no
+ option to choose your Mageia operating system.
+ </p>
+
+
+ <p>In Windows, to recover the space used by Mageia partitions: click on
+ <span class="guimenu">Start</span> &#8594; <span class="guimenuitem">Control
+ Panel</span> &#8594; <span class="guimenuitem">Administrative Tools</span> &#8594; <span class="guimenuitem">Computer Management</span> &#8594; <span class="guimenuitem">Storage</span> &#8594; <span class="guimenuitem">Disk
+ Management</span>. You will recognise a Mageia
+ partition because they are labeled <code class="literal">Unknown</code>, and also by
+ their size and place on the disk. Right-click on each of these partitions
+ and select <span class="emphasis"><em>Delete</em></span> to free up the space.
+ </p>
+
+
+ <p>If you are using Windows XP, you can create a new partition and format it
+ (FAT32 or NTFS). It will then get a partition letter.
+ </p>
+
+
+ <p>If you have Vista or 7, you have one more possibility, you can extend the
+ existing partition that is at the left of the freed space. There are other
+ partitioning tools that can be used, such as <span class="bold"><strong>gparted</strong></span>, available for both Windows and Linux. As
+ always, when changing partitions, be very careful to back up anything
+ important to you.
+ </p>
</div>
</body>