aboutsummaryrefslogtreecommitdiffstats
path: root/zh_cn/index.html
diff options
context:
space:
mode:
authorPapoteur <papoteur@mageialinux-online.org>2017-06-06 08:09:51 +0200
committerPapoteur <papoteur@mageialinux-online.org>2017-06-06 08:09:51 +0200
commit53c6e9c6182effaccf531785973d11602c9d15cf (patch)
tree1e4a77c9ae20e2704c7c25e0be2d7b8b787c9990 /zh_cn/index.html
parent60c6874f090c8811127076961411ed7d8991a504 (diff)
downloaddrakx-installer-help-53c6e9c6182effaccf531785973d11602c9d15cf.tar
drakx-installer-help-53c6e9c6182effaccf531785973d11602c9d15cf.tar.gz
drakx-installer-help-53c6e9c6182effaccf531785973d11602c9d15cf.tar.bz2
drakx-installer-help-53c6e9c6182effaccf531785973d11602c9d15cf.tar.xz
drakx-installer-help-53c6e9c6182effaccf531785973d11602c9d15cf.zip
Add Chinese simplified files
Diffstat (limited to 'zh_cn/index.html')
-rw-r--r--zh_cn/index.html17
1 files changed, 17 insertions, 0 deletions
diff --git a/zh_cn/index.html b/zh_cn/index.html
index 686c281..b25a19b 100644
--- a/zh_cn/index.html
+++ b/zh_cn/index.html
@@ -28,8 +28,13 @@
<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>
+<<<<<<< HEAD
+ <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#d5e122">&#19979;&#36733;&#21644;&#26816;&#26597;&#23186;&#20171;</a></span></dt>
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e149">&#21051;&#24405;&#25110;&#36716;&#20648; ISO</a></span></dt>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</dl>
</dd>
<dt><span class="section"><a href="installer.html">DrakX&#65292;Mageia &#30340;&#23433;&#35013;&#22120;</a></span></dt>
@@ -75,11 +80,19 @@
<dt><span class="section"><a href="setupBootloader.html">&#24341;&#23548;&#31243;&#24207;&#30340;&#20027;&#35201;&#36873;&#39033;</a></span></dt>
<dd>
<dl>
+<<<<<<< HEAD
+ <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#d5e891">&#24341;&#23548;&#22120;&#30028;&#38754;</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e921">&#20351;&#29992; Mageia &#25552;&#20379;&#30340;&#24341;&#23548;&#22120;</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e938">&#20351;&#29992;&#29616;&#23384;&#30340;&#24341;&#23548;&#22120;</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e941">&#20351;&#29992;&#38142;&#24335;&#21152;&#36733;&#65288;chain loading&#65289;</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e958">&#36873;&#39033;</a></span></dt>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</dl>
</dd>
<dt><span class="section"><a href="setupBootloaderAddEntry.html">&#28155;&#21152;&#25110;&#20462;&#25913;&#24341;&#23548;&#33756;&#21333;&#39033;</a></span></dt>
@@ -113,7 +126,11 @@
<dt><span class="section"><a href="uninstall-Mageia.html">&#21368;&#36733;Mageia</a></span></dt>
<dd>
<dl>
+<<<<<<< HEAD
+ <dt><span class="section"><a href="uninstall-Mageia.html#d5e1232">&#22914;&#20309;&#20570;</a></span></dt>
+=======
<dt><span class="section"><a href="uninstall-Mageia.html#d5e1262">&#22914;&#20309;&#20570;</a></span></dt>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</dl>
</dd>
</dl>