From 8f7de370a7103f809917a71bc24ca1b16543f06e Mon Sep 17 00:00:00 2001
From: Papoteur <papoteur@mageialinux-online.org>
Date: Tue, 6 Jun 2017 07:53:01 +0200
Subject: Update French files

---
 fr/index.html | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'fr/index.html')

diff --git a/fr/index.html b/fr/index.html
index d355dbd..3391861 100644
--- a/fr/index.html
+++ b/fr/index.html
@@ -28,8 +28,8 @@
                   <dl>
                      <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e19">Introduction</a></span></dt>
                      <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e29">M&eacute;dia</a></span></dt>
-                     <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e142">T&eacute;l&eacute;charger et v&eacute;rifier les m&eacute;dia</a></span></dt>
-                     <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e169">Graver ou copier l'ISO</a></span></dt>
+                     <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e119">T&eacute;l&eacute;charger et v&eacute;rifier les m&eacute;dia</a></span></dt>
+                     <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e146">Graver ou copier l'ISO</a></span></dt>
                   </dl>
                </dd>
                <dt><span class="section"><a href="installer.html">DrakX, l'installateur de Mageia</a></span></dt>
@@ -75,6 +75,16 @@
                <dt><span class="section"><a href="setupBootloader.html">Principales options du chargeur de d&eacute;marrage</a></span></dt>
                <dd>
                   <dl>
+<<<<<<< HEAD
+                     <dt><span class="section"><a href="setupBootloader.html#d5e911">Interface du programme d'amor&ccedil;age</a></span></dt>
+                     <dt><span class="section"><a href="setupBootloader.html#d5e939">Utiliser un chargeur de d&eacute;marrage Mageia</a></span></dt>
+                     <dt><span class="section"><a href="setupBootloader.html#d5e955">Utiliser un chargeur de d&eacute;marrage existant.  </a></span></dt>
+                     <dt><span class="section"><a href="setupBootloader.html#d5e958">Utilisation du chargement en cha&icirc;ne</a></span></dt>
+                     <dt><span class="section"><a href="setupBootloader.html#d5e974">Options</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="section"><a href="setupBootloaderAddEntry.html">Ajouter ou Modifier une Entr&eacute;e de Menu de D&eacute;marrage</a></span></dt>
+=======
                      <dt><span class="section"><a href="setupBootloader.html#d5e918">Avec un syst&egrave;me BIOS</a></span></dt>
                      <dt><span class="section"><a href="setupBootloader.html#d5e955">Avec un syst&egrave;me UEFI</a></span></dt>
                   </dl>
@@ -86,6 +96,7 @@
                      <dt><span class="section"><a href="setupBootloaderAddEntry.html#d5e991">Avec un syst&egrave;me UEFI</a></span></dt>
                   </dl>
                </dd>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                <dt><span class="section"><a href="misc-params.html">R&eacute;sum&eacute; des diff&eacute;rents param&egrave;tres</a></span></dt>
                <dd>
                   <dl>
@@ -116,7 +127,11 @@
                <dt><span class="section"><a href="uninstall-Mageia.html">D&eacute;sinstaller Mageia</a></span></dt>
                <dd>
                   <dl>
+<<<<<<< HEAD
+                     <dt><span class="section"><a href="uninstall-Mageia.html#d5e1281">Guide</a></span></dt>
+=======
                      <dt><span class="section"><a href="uninstall-Mageia.html#d5e1230">Guide</a></span></dt>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                   </dl>
                </dd>
             </dl>
-- 
cgit v1.2.1