diff options
| author | Papoteur <papoteur@mageialinux-online.org> | 2017-06-06 08:09:51 +0200 |
|---|---|---|
| committer | Papoteur <papoteur@mageialinux-online.org> | 2017-06-06 08:09:51 +0200 |
| commit | 53c6e9c6182effaccf531785973d11602c9d15cf (patch) | |
| tree | 1e4a77c9ae20e2704c7c25e0be2d7b8b787c9990 /zh_cn/index.html | |
| parent | 60c6874f090c8811127076961411ed7d8991a504 (diff) | |
| download | drakx-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.html | 17 |
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">简介</a></span></dt> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e29">介质</a></span></dt> +<<<<<<< HEAD + <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e119">下载和检查媒介</a></span></dt> + <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e146">刻录或转储 ISO</a></span></dt> +======= <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e122">下载和检查媒介</a></span></dt> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e149">刻录或转储 ISO</a></span></dt> +>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </dl> </dd> <dt><span class="section"><a href="installer.html">DrakX，Mageia 的安装器</a></span></dt> @@ -75,11 +80,19 @@ <dt><span class="section"><a href="setupBootloader.html">引导程序的主要选项</a></span></dt> <dd> <dl> +<<<<<<< HEAD + <dt><span class="section"><a href="setupBootloader.html#d5e874">引导器界面</a></span></dt> + <dt><span class="section"><a href="setupBootloader.html#d5e898">使用 Mageia 提供的引导器</a></span></dt> + <dt><span class="section"><a href="setupBootloader.html#d5e912">使用现存的引导器</a></span></dt> + <dt><span class="section"><a href="setupBootloader.html#d5e915">使用链式加载（chain loading）</a></span></dt> + <dt><span class="section"><a href="setupBootloader.html#d5e929">选项</a></span></dt> +======= <dt><span class="section"><a href="setupBootloader.html#d5e891">引导器界面</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e921">使用 Mageia 提供的引导器</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e938">使用现存的引导器</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e941">使用链式加载（chain loading）</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e958">选项</a></span></dt> +>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </dl> </dd> <dt><span class="section"><a href="setupBootloaderAddEntry.html">添加或修改引导菜单项</a></span></dt> @@ -113,7 +126,11 @@ <dt><span class="section"><a href="uninstall-Mageia.html">卸载Mageia</a></span></dt> <dd> <dl> +<<<<<<< HEAD + <dt><span class="section"><a href="uninstall-Mageia.html#d5e1232">如何做</a></span></dt> +======= <dt><span class="section"><a href="uninstall-Mageia.html#d5e1262">如何做</a></span></dt> +>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </dl> </dd> </dl> |