From 1cb3e13aeca8038beaa871e7b6e45612e9703f4d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Th=C3=A9r=C3=A8se=20Godefroy?= <godef.th@free.fr>
Date: Thu, 21 Sep 2017 17:20:41 +0200
Subject: [PATCH] fr: fix comments and spaces.

---
 fr/index.html                | 83 +-----------------------------------
 fr/kitchen/next_steps.t.html |  5 ++-
 fr/mac.html                  | 79 ----------------------------------
 fr/next_steps.html           | 48 ++-------------------
 fr/windows.html              | 83 +-----------------------------------
 fr/workshops.html            | 40 +----------------
 6 files changed, 11 insertions(+), 327 deletions(-)

diff --git a/fr/index.html b/fr/index.html
index 38a4d78c..0ea47b2b 100644
--- a/fr/index.html
+++ b/fr/index.html
@@ -829,22 +829,6 @@ publiques&nbsp;» et cliquez sur OK.</p>
 appartient effectivement à Edward.&nbsp;» Cela ne signifie pas grand chose étant donné
 qu'Edward n'est pas une personne réelle, mais c'est un bon entraînement.</p>
 
-<!--<div id="pgp-pathfinder">
-
-<form enctype="application/x-www-form-urlencoded" action="/mk_path.cgi" method="get">
-
-<p><strong>From:</strong>
-<input type="text" placeholder="xD41A008" name="FROM"></p>
-
-<p><strong>To:</strong>
-<input type="text" placeholder="50BD01x4" name="TO"></p>
-
-<p class="buttons"><input type="submit" value="trust paths" name="PATHS">
-<input type="reset" value="reset" name=".reset"></p>
-
-</form>
-
-</div>End #pgp-pathfinder -->
 </div><!-- End .main -->
 </div><!-- End #step-4a .step -->
 
@@ -1035,21 +1019,6 @@ plus valable.</p>
 </div><!-- End .main -->
 </div><!-- End #step-lost_key .step-->
 
-<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
-<!---<div id="transfer-key" class="step">
-<div class="main">
-
-<h3>Transferring you key</h3>
-
-<p>You can use Enigmail's <a href="https://www.enigmail.net/documentation/keyman.php">key
-management window</a> to import and export keys. If you want to be able to read your
-encrypted email on a different computer, you will need to export your secret key from
-here. Be warned, if you transfer the key without <a
-href="https://help.ubuntu.com/community/EncryptedFilesystemsOnRemovableStorage">encrypting</a>
-the drive it's on the transfer will be dramatically less secure.</p>
-
-</div> --> <!-- End .main </div> --> <!-- End #transfer-key .step-->
-
 <!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
 <div id="webmail-and-GnuPG" class="step">
 <div class="main">
@@ -1063,26 +1032,8 @@ déchiffrer le courriel chiffré, il l'affichera quand même sous forme chiffré
 utilisez majoritairement un webmail, vous saurez ainsi que c'est le moment de lancer votre
 logiciel de messagerie pour lire le message en clair.</p>
 
-<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~
-<div id="transfer-key" class="step">
-<div class="main">
-
-<h3>Make your public key part of your online identity</h3>
-
-<p> First add your public key fingerprint to your email signature, then compose an email
-to at least five of your friends, telling them you just set up GnuPG and mentioning your
-public key fingerprint. Link to this guide and ask them to join you. Don't forget that
-there's also an awesome <a href="infographic.html">infographic to share.</a></p>
-
-<p class="notes">Start writing your public key fingerprint anywhere someone would see
-your email address: your social media profiles, blog, Website, or business card. (At the
-Free Software Foundation, we put ours on our <a href="https://fsf.org/about/staff">staff
-page</a>.) We need to get our culture to the point that we feel like something is missing
-when we see an email address without a public key fingerprint.</p>
-
- -->
-</div> <!-- End .main -->
-</div> <!-- End #webmail-and-GnuPG .step -->
+</div><!-- End .main -->
+</div><!-- End #webmail-and-GnuPG .step -->
 </div></section><!-- End #section5 -->
 
 <!-- ~~~~~~~~~ Section 6: Next steps ~~~~~~~~~ -->
@@ -1096,36 +1047,6 @@ when we see an email address without a public key fingerprint.</p>
 </div><!-- End #step-click_here .step-->
 </section><!-- End #section6 -->
 
-<!-- ~~~~~~~~~ FAQ ~~~~~~~~~ -->
-<!-- When un-commenting this section go to main.css and search for /* Guide Sections
-Background */ then add #faq to the desired color <section class="row" id="faq">
-<div>
-<div class="sidebar">
-
-<h2>FAQ</h2>
-
-</div>
-<div class="main">
-
-<dl>
-<dt>My key expired</dt>
-
-<dd>Answer coming soon.</dd>
-
-<dt>Who can read encrypted messages? Who can read signed ones?</dt>
-
-<dd>Answer coming soon.</dd>
-
-<dt>My email program is opening at times I don't want it to open/is now my default program
-and I don't want it to be.</dt>
-
-<dd>Answer coming soon.</dd>
-</dl>
-
-</div>
-</div>
-</section> --><!-- End #faq -->
-
 <!-- ~~~~~~~~~ Footer ~~~~~~~~~ -->
 <footer class="row" id="footer"><div>
 <div id="copyright">
diff --git a/fr/kitchen/next_steps.t.html b/fr/kitchen/next_steps.t.html
index a00ad792..7c3bb3ca 100644
--- a/fr/kitchen/next_steps.t.html
+++ b/fr/kitchen/next_steps.t.html
@@ -43,10 +43,11 @@ pour le changement.</p>
 
 <p style="font-size:150%"> <a href="https://status.fsf.org/fsf"> <img
 src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
-alt="[GNU Social]" /> &nbsp;GNU Social </a> |&nbsp; <a href="http://microca.st/fsf">
+alt="[GNU Social]" />
+&nbsp;GNU Social</a>&nbsp; |&nbsp; <a href="http://microca.st/fsf">
 <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
 alt="[Pump.io]" />
-&nbsp;Pump.io </a> |&nbsp; <a href="https://www.twitter.com/fsf">Twitter</a> </p>
+&nbsp;Pump.io </a>&nbsp; |&nbsp; <a href="https://www.twitter.com/fsf">Twitter</a> </p>
 
 <p><small>Découvrez <a href="https://www.fsf.org/twitter"> pourquoi GNU Social et
 Pump.io sont mieux que Twitter</a> et <a href="http://www.fsf.org/facebook"> pourquoi nous
diff --git a/fr/mac.html b/fr/mac.html
index 3f796bc5..d93ebec9 100644
--- a/fr/mac.html
+++ b/fr/mac.html
@@ -833,22 +833,6 @@ publiques&nbsp;» et cliquez sur OK.</p>
 appartient effectivement à Edward.&nbsp;» Cela ne signifie pas grand chose étant donné
 qu'Edward n'est pas une personne réelle, mais c'est un bon entraînement.</p>
 
-<!--<div id="pgp-pathfinder">
-
-<form enctype="application/x-www-form-urlencoded" action="/mk_path.cgi" method="get">
-
-<p><strong>From:</strong>
-<input type="text" placeholder="xD41A008" name="FROM"></p>
-
-<p><strong>To:</strong>
-<input type="text" placeholder="50BD01x4" name="TO"></p>
-
-<p class="buttons"><input type="submit" value="trust paths" name="PATHS">
-<input type="reset" value="reset" name=".reset"></p>
-
-</form>
-
-</div>End #pgp-pathfinder -->
 </div><!-- End .main -->
 </div><!-- End #step-4a .step -->
 
@@ -1039,21 +1023,6 @@ plus valable.</p>
 </div><!-- End .main -->
 </div><!-- End #step-lost_key .step-->
 
-<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
-<!---<div id="transfer-key" class="step">
-<div class="main">
-
-<h3>Transferring you key</h3>
-
-<p>You can use Enigmail's <a href="https://www.enigmail.net/documentation/keyman.php">key
-management window</a> to import and export keys. If you want to be able to read your
-encrypted email on a different computer, you will need to export your secret key from
-here. Be warned, if you transfer the key without <a
-href="https://help.ubuntu.com/community/EncryptedFilesystemsOnRemovableStorage">encrypting</a>
-the drive it's on the transfer will be dramatically less secure.</p>
-
-</div> --> <!-- End .main </div> --> <!-- End #transfer-key .step-->
-
 <!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
 <div id="webmail-and-GnuPG" class="step">
 <div class="main">
@@ -1067,24 +1036,6 @@ déchiffrer le courriel chiffré, il l'affichera quand même sous forme chiffré
 utilisez majoritairement un webmail, vous saurez ainsi que c'est le moment de lancer votre
 logiciel de messagerie pour lire le message en clair.</p>
 
-<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~
-<div id="transfer-key" class="step">
-<div class="main">
-
-<h3>Make your public key part of your online identity</h3>
-
-<p> First add your public key fingerprint to your email signature, then compose an email
-to at least five of your friends, telling them you just set up GnuPG and mentioning your
-public key fingerprint. Link to this guide and ask them to join you. Don't forget that
-there's also an awesome <a href="infographic.html">infographic to share.</a></p>
-
-<p class="notes">Start writing your public key fingerprint anywhere someone would see
-your email address: your social media profiles, blog, Website, or business card. (At the
-Free Software Foundation, we put ours on our <a href="https://fsf.org/about/staff">staff
-page</a>.) We need to get our culture to the point that we feel like something is missing
-when we see an email address without a public key fingerprint.</p>
-
- -->
 </div> <!-- End .main -->
 </div> <!-- End #webmail-and-GnuPG .step -->
 </div></section><!-- End #section5 -->
@@ -1100,36 +1051,6 @@ when we see an email address without a public key fingerprint.</p>
 </div><!-- End #step-click_here .step-->
 </section><!-- End #section6 -->
 
-<!-- ~~~~~~~~~ FAQ ~~~~~~~~~ -->
-<!-- When un-commenting this section go to main.css and search for /* Guide Sections
-Background */ then add #faq to the desired color <section class="row" id="faq">
-<div>
-<div class="sidebar">
-
-<h2>FAQ</h2>
-
-</div>
-<div class="main">
-
-<dl>
-<dt>My key expired</dt>
-
-<dd>Answer coming soon.</dd>
-
-<dt>Who can read encrypted messages? Who can read signed ones?</dt>
-
-<dd>Answer coming soon.</dd>
-
-<dt>My email program is opening at times I don't want it to open/is now my default program
-and I don't want it to be.</dt>
-
-<dd>Answer coming soon.</dd>
-</dl>
-
-</div>
-</div>
-</section> --><!-- End #faq -->
-
 <!-- ~~~~~~~~~ Footer ~~~~~~~~~ -->
 <footer class="row" id="footer"><div>
 <div id="copyright">
diff --git a/fr/next_steps.html b/fr/next_steps.html
index 15a92aeb..d18a0ef8 100644
--- a/fr/next_steps.html
+++ b/fr/next_steps.html
@@ -63,10 +63,10 @@ pour le changement.</p>
 
 <p style="font-size:150%"> <a href="https://status.fsf.org/fsf"> <img
 src="//static.fsf.org/nosvn/enc-dev0/img/gnu-social.png" class="share-logo"
-alt="[GNU Social]" /> &nbsp;GNU Social </a> |&nbsp; <a href="http://microca.st/fsf">
+alt="[GNU Social]" /> &nbsp;GNU Social</a>&nbsp; |&nbsp; <a href="http://microca.st/fsf">
 <img src="//static.fsf.org/nosvn/enc-dev0/img/pump.io.png" class="share-logo"
 alt="[Pump.io]" />
-&nbsp;Pump.io </a> |&nbsp; <a href="https://www.twitter.com/fsf">Twitter</a> </p>
+&nbsp;Pump.io</a>&nbsp; |&nbsp; <a href="https://www.twitter.com/fsf">Twitter</a> </p>
 
 <p><small>Découvrez <a href="https://www.fsf.org/twitter"> pourquoi GNU Social et
 Pump.io sont mieux que Twitter</a> et <a href="http://www.fsf.org/facebook"> pourquoi nous
@@ -121,7 +121,7 @@ les nôtres sur les pages présentant nos équipes.</li>
 </ul>
 
 </div><!-- End .main -->
-</div><!-- End #step-friends .step -->
+</div><!-- End #teach-friends .step -->
 
 <!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
 <div id="step-more_technologies" class="step">
@@ -210,50 +210,8 @@ alt="[Faites un don]" src="//static.fsf.org/nosvn/enc-dev0/img/fr/donate.png" />
 
 <br /> </div><!-- End .main -->
 </div><!-- End #step-better .step -->
-
-<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~
-<div id="step-learn_more" class="step">
-<div class="main">
-
-<h3>Learn more about GnuPG</h3>
-
-<p>There are a lot more features of GnuPG to discover, including encrypting files on your
-computer. There are a variety of resources accessible via Google, but we recommend starting
-with the links on the <a href="https://www.gnupg.org/documentation/">GnuPG Web site</a>.</p>
-
-</div> --><!-- End .main -->
-<!-- </div> --><!-- End #step-learn_more .step -->
 </div></section><!-- End #section6 -->
 
-<!-- ~~~~~~~~~ FAQ ~~~~~~~~~ -->
-<!-- When un-commenting this section go to main.css and search for /* Guide Sections
-Background */ then add #faq to the desired color <section class="row" id="faq"><div>
-<div class="sidebar">
-
-<h2>FAQ</h2>
-
-</div>
-<div class="main">
-
-<dl>
-<dt>My key expired</dt>
-
-<dd>Answer coming soon.</dd>
-
-<dt>Who can read encrypted messages? Who can read signed ones?</dt>
-
-<dd>Answer coming soon.</dd>
-
-<dt>My email program is opening at times I don't want it to open/is now my default program
-and I don't want it to be.</dt>
-
-<dd>Answer coming soon.</dd>
-</dl>
-
-</div>
-</div>
-</section> --><!-- End #faq -->
-
 <!-- ~~~~~~~~~ Footer ~~~~~~~~~ -->
 <footer class="row" id="footer"><div>
 <div id="copyright">
diff --git a/fr/windows.html b/fr/windows.html
index 588063c7..fb19a016 100644
--- a/fr/windows.html
+++ b/fr/windows.html
@@ -834,22 +834,6 @@ publiques&nbsp;» et cliquez sur OK.</p>
 appartient effectivement à Edward.&nbsp;» Cela ne signifie pas grand chose étant donné
 qu'Edward n'est pas une personne réelle, mais c'est un bon entraînement.</p>
 
-<!--<div id="pgp-pathfinder">
-
-<form enctype="application/x-www-form-urlencoded" action="/mk_path.cgi" method="get">
-
-<p><strong>From:</strong>
-<input type="text" placeholder="xD41A008" name="FROM"></p>
-
-<p><strong>To:</strong>
-<input type="text" placeholder="50BD01x4" name="TO"></p>
-
-<p class="buttons"><input type="submit" value="trust paths" name="PATHS">
-<input type="reset" value="reset" name=".reset"></p>
-
-</form>
-
-</div>End #pgp-pathfinder -->
 </div><!-- End .main -->
 </div><!-- End #step-4a .step -->
 
@@ -1040,21 +1024,6 @@ plus valable.</p>
 </div><!-- End .main -->
 </div><!-- End #step-lost_key .step-->
 
-<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
-<!---<div id="transfer-key" class="step">
-<div class="main">
-
-<h3>Transferring you key</h3>
-
-<p>You can use Enigmail's <a href="https://www.enigmail.net/documentation/keyman.php">key
-management window</a> to import and export keys. If you want to be able to read your
-encrypted email on a different computer, you will need to export your secret key from
-here. Be warned, if you transfer the key without <a
-href="https://help.ubuntu.com/community/EncryptedFilesystemsOnRemovableStorage">encrypting</a>
-the drive it's on the transfer will be dramatically less secure.</p>
-
-</div> --> <!-- End .main </div> --> <!-- End #transfer-key .step-->
-
 <!-- ~~~~~~~~~ a div for each step ~~~~~~~~~ -->
 <div id="webmail-and-GnuPG" class="step">
 <div class="main">
@@ -1068,26 +1037,8 @@ déchiffrer le courriel chiffré, il l'affichera quand même sous forme chiffré
 utilisez majoritairement un webmail, vous saurez ainsi que c'est le moment de lancer votre
 logiciel de messagerie pour lire le message en clair.</p>
 
-<!-- ~~~~~~~~~ a div for each step ~~~~~~~~~
-<div id="transfer-key" class="step">
-<div class="main">
-
-<h3>Make your public key part of your online identity</h3>
-
-<p> First add your public key fingerprint to your email signature, then compose an email
-to at least five of your friends, telling them you just set up GnuPG and mentioning your
-public key fingerprint. Link to this guide and ask them to join you. Don't forget that
-there's also an awesome <a href="infographic.html">infographic to share.</a></p>
-
-<p class="notes">Start writing your public key fingerprint anywhere someone would see
-your email address: your social media profiles, blog, Website, or business card. (At the
-Free Software Foundation, we put ours on our <a href="https://fsf.org/about/staff">staff
-page</a>.) We need to get our culture to the point that we feel like something is missing
-when we see an email address without a public key fingerprint.</p>
-
- -->
-</div> <!-- End .main -->
-</div> <!-- End #webmail-and-GnuPG .step -->
+</div><!-- End .main -->
+</div><!-- End #webmail-and-GnuPG .step -->
 </div></section><!-- End #section5 -->
 
 <!-- ~~~~~~~~~ Section 6: Next steps ~~~~~~~~~ -->
@@ -1101,36 +1052,6 @@ when we see an email address without a public key fingerprint.</p>
 </div><!-- End #step-click_here .step-->
 </section><!-- End #section6 -->
 
-<!-- ~~~~~~~~~ FAQ ~~~~~~~~~ -->
-<!-- When un-commenting this section go to main.css and search for /* Guide Sections
-Background */ then add #faq to the desired color <section class="row" id="faq">
-<div>
-<div class="sidebar">
-
-<h2>FAQ</h2>
-
-</div>
-<div class="main">
-
-<dl>
-<dt>My key expired</dt>
-
-<dd>Answer coming soon.</dd>
-
-<dt>Who can read encrypted messages? Who can read signed ones?</dt>
-
-<dd>Answer coming soon.</dd>
-
-<dt>My email program is opening at times I don't want it to open/is now my default program
-and I don't want it to be.</dt>
-
-<dd>Answer coming soon.</dd>
-</dl>
-
-</div>
-</div>
-</section> --><!-- End #faq -->
-
 <!-- ~~~~~~~~~ Footer ~~~~~~~~~ -->
 <footer class="row" id="footer"><div>
 <div id="copyright">
diff --git a/fr/workshops.html b/fr/workshops.html
index 7706fd9b..35cb05ed 100644
--- a/fr/workshops.html
+++ b/fr/workshops.html
@@ -129,15 +129,6 @@ votre communauté.</p>
 
 </div><!-- End .section-intro -->
 <div id="step-aa" class="step">
-<div class="sidebar">
-<!-- Workshops image commented out from here, to be used above instead.
-
-<p><img id="workshops-image"
-src="//static.fsf.org/nosvn/enc-dev0/img/en/screenshots/workshop-section1.png"
-alt="Workshop icon"></p>
-
--->
-</div><!-- /.sidebar -->
 <div class="main">
 
 <h3>La force du nombre</h3>
@@ -194,7 +185,7 @@ devenir des cybercitoyens en pleine possession de leurs moyens, nous devons pren
 notre propre sécurité.</p>
 
 </div><!-- End .main -->
-</div><!-- End #step-2a .step -->
+</div><!-- End #step-aa .step -->
 </div></section><!-- End #section1 -->
 
 <!-- ~~~~~~~~~ Section 2: Plan The Workshop ~~~~~~~~~ -->
@@ -324,35 +315,6 @@ de nous les communiquer à <a href="mailto:campaigns@fsf.org">campaigns@fsf.org<
 </div><!-- End .section-intro -->
 </div></section><!-- End #section6 -->
 
-<!-- ~~~~~~~~~ FAQ ~~~~~~~~~ -->
-<!-- When un-commenting this section go to main.css and search for /* Guide Sections
-Background */ then add #faq to the desired color <section class="row" id="faq"><div>
-<div class="sidebar">
-
-<h2>FAQ</h2>
-
-</div>
-<div class="main">
-
-<dl>
-<dt>My key expired</dt>
-
-<dd>Answer coming soon.</dd>
-
-<dt>Who can read encrypted messages? Who can read signed ones?</dt>
-
-<dd>Answer coming soon.</dd>
-
-<dt>My email program is opening at times I don't want it to open/is now my default program
-and I don't want it to be.</dt>
-
-<dd>Answer coming soon.</dd>
-</dl>
-
-</div>
-</div>
-</section> --><!-- End #faq -->
-
 <!-- ~~~~~~~~~ Footer ~~~~~~~~~ -->
 <footer class="row" id="footer"><div>
 <div id="copyright">
-- 
2.25.1