From a2b0e3556fd08b8cdb1307b5e7af3ebc37db24e2 Mon Sep 17 00:00:00 2001
From: root <root@april.org>
Date: Tue, 13 Sep 2016 17:42:39 +0200
Subject: [PATCH] MaJ liens contenu

---
 htdocs/en/a-propos-april-et-expolibre-contenu.php     |  2 +-
 htdocs/en/enjeux-du-logiciel-libre-contenu.php        |  6 +++---
 htdocs/en/footer.php                                  | 10 +++++-----
 htdocs/en/formats-ouverts-contenu.php                 |  6 +++---
 htdocs/en/home-contenu.php                            |  6 +++---
 htdocs/en/licences-logiciels-libres-contenu.php       |  6 +++---
 htdocs/en/logiciel-libre-au-quotidien-contenu.php     |  4 ++--
 htdocs/en/logiciel-libre-contenu.php                  |  4 ++--
 htdocs/en/logiciels-libres-pour-education-contenu.php |  6 +++---
 htdocs/en/modeles-libres-contenu.php                  |  4 ++--
 10 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/htdocs/en/a-propos-april-et-expolibre-contenu.php b/htdocs/en/a-propos-april-et-expolibre-contenu.php
index d0b8b12..21cd85f 100644
--- a/htdocs/en/a-propos-april-et-expolibre-contenu.php
+++ b/htdocs/en/a-propos-april-et-expolibre-contenu.php
@@ -32,7 +32,7 @@ LibreExpo is organized by April's awareness-raising task force, whose objective
 <!-- row 8 col - fin panneau -->
 <!-- debut navigation -->
   <div class="navigation">
-   <a  class="button" href="modeles-libres.php">previous</a>
+   <a  class="button" href="beyond-free-software.php">previous</a>
   </div>
  <!-- fin contenu -->
   </div>
diff --git a/htdocs/en/enjeux-du-logiciel-libre-contenu.php b/htdocs/en/enjeux-du-logiciel-libre-contenu.php
index 4dad085..72ffb08 100644
--- a/htdocs/en/enjeux-du-logiciel-libre-contenu.php
+++ b/htdocs/en/enjeux-du-logiciel-libre-contenu.php
@@ -18,8 +18,8 @@ Free Software provides more independence and better control of maintenance and i
 <p>Since it is unencumbered by either usage restrictions or license costs, Free Software allows public administrations and policy makers to retain control of their own data. Thus, for a number of years now, both in State and local governments, entire branches of information systems have been switching to Free Software. In a world where surveillance is generalized, Free Software is an essential tool for protecting and perpetuating your data (files, photos, videos, etc.)</p>
 <!-- debut navigation -->
   <div class="navigation">
-   <a  class="button" href="logiciel-libre.php">previous</a>
-   <a  class="button aller" href="logiciel-libre-au-quotidien.php">next</a>
+   <a  class="button" href="free-libre-software.php">previous</a>
+   <a  class="button aller" href="free-libre-software-in-daily-life.php">next</a>
   </div>
  <!-- fin contenu -->
   </div>
@@ -29,4 +29,4 @@ Free Software provides more independence and better control of maintenance and i
    <div class="large-2 columns"></div>
 </div>
 <!-- fin row 1  -->
-</section>
\ No newline at end of file
+</section>
diff --git a/htdocs/en/footer.php b/htdocs/en/footer.php
index d90dcfa..3129518 100644
--- a/htdocs/en/footer.php
+++ b/htdocs/en/footer.php
@@ -4,16 +4,16 @@
   <div class="large-8 columns">  
     <ul class="inline-list">
     <li><a href="index.php">Home</a></li>
-    <li><a href="exposition.php">The Exhibit</a></li>
-    <li><a href="telecharger.php">Download</a></li>
-    <li><a href="exposer.php">Exhibit</a></li>
-    <li><a href="a-propos.php">About</a></li>
+    <li><a href="exhibition.php">The Exhibit</a></li>
+    <li><a href="download.php">Download</a></li>
+    <li><a href="exhibit.php">Exhibit</a></li>
+    <li><a href="about.php">About</a></li>
     <li><a href="credits.php">Credits</a></li>
     <li><a href="contact.php">Contact</a></li>
     </ul>
   </div>
   <div class="large-2 columns logo">
-   <a href="http://www.april.org/"><img src="img/april_logo.svg" alt="Association April" title="April, Promoting and Protecting Free Software."/></a>
+   <a href="http://www.april.org/"><img src="/img/april_logo.svg" alt="Association April" title="April, Promoting and Protecting Free Software."/></a>
   </div>
 </div>
 <!-- fin footer  --> 
diff --git a/htdocs/en/formats-ouverts-contenu.php b/htdocs/en/formats-ouverts-contenu.php
index 645d781..069e52f 100644
--- a/htdocs/en/formats-ouverts-contenu.php
+++ b/htdocs/en/formats-ouverts-contenu.php
@@ -22,8 +22,8 @@ IT is everywhere, and now serves as a repository for a large part of our cultura
 <!-- row 8 col - fin panneau -->
 <!-- debut navigation -->
   <div class="navigation">
-   <a  class="button" href="logiciel-libre-au-quotidien.php">previous</a>
-   <a  class="button aller" href="logiciels-libres-pour-education.php">next</a>
+   <a  class="button" href="free-libre-software-in-daily-life.php">previous</a>
+   <a  class="button aller" href="free-libre-software-in-education.php">next</a>
   </div>
  <!-- fin contenu -->
   </div>
@@ -33,4 +33,4 @@ IT is everywhere, and now serves as a repository for a large part of our cultura
    <div class="large-2 columns"></div>
 </div>
 <!-- fin row 1  -->
-</section>
\ No newline at end of file
+</section>
diff --git a/htdocs/en/home-contenu.php b/htdocs/en/home-contenu.php
index e8df406..acbeab8 100644
--- a/htdocs/en/home-contenu.php
+++ b/htdocs/en/home-contenu.php
@@ -14,19 +14,19 @@ Happy reading!</p>
     <div class="row">
      <div class="large-4 columns">
       <div class="panel">
-       <a class="button" href="exposition.php">Learn more</a> 
+       <a class="button" href="exhibition.php">Learn more</a> 
        <p>See the panels now!</p>
       </div>
      </div>
      <div class="large-4 columns">
       <div class="panel">
-       <a class="button" href="telecharger.php">Download</a> 
+       <a class="button" href="download.php">Download</a> 
        <p>Download the exhibit panels and their source code in different formats.</p>
       </div>
      </div>
        <div class="large-4 columns">
         <div class="panel">
-        <a class="button" href="exposer.php">Exhibit</a> 
+        <a class="button" href="exhibit.php">Exhibit</a> 
         <p>Place an order for the panels in order to organize an exhibit in your town.</p>
        </div>
       </div>
diff --git a/htdocs/en/licences-logiciels-libres-contenu.php b/htdocs/en/licences-logiciels-libres-contenu.php
index 6bc344e..21cbe02 100644
--- a/htdocs/en/licences-logiciels-libres-contenu.php
+++ b/htdocs/en/licences-logiciels-libres-contenu.php
@@ -17,8 +17,8 @@ Among the Free Software licenses, some are said to be copyleft. The principle of
 <!-- row 8 col - fin panneau -->
 <!-- debut navigation -->
   <div class="navigation">
-   <a  class="button" href="logiciels-libres-pour-education.php">previous</a>
-   <a  class="button aller" href="modeles-libres.php">next</a>
+   <a  class="button" href="free-libre-software-in-education.php">previous</a>
+   <a  class="button aller" href="free-licenses.php">next</a>
   </div>
  <!-- fin contenu -->
   </div>
@@ -28,4 +28,4 @@ Among the Free Software licenses, some are said to be copyleft. The principle of
    <div class="large-2 columns"></div>
 </div>
 <!-- fin row 1  -->
-</section>
\ No newline at end of file
+</section>
diff --git a/htdocs/en/logiciel-libre-au-quotidien-contenu.php b/htdocs/en/logiciel-libre-au-quotidien-contenu.php
index 6f1bc19..9be3708 100644
--- a/htdocs/en/logiciel-libre-au-quotidien-contenu.php
+++ b/htdocs/en/logiciel-libre-au-quotidien-contenu.php
@@ -25,8 +25,8 @@ There are also free programs that can be installed on servers for Internet acces
 <!-- row 8 col - fin panneau -->
 <!-- debut navigation -->
   <div class="navigation">
-   <a  class="button" href="enjeux-du-logiciel-libre.php">previous</a>
-   <a  class="button aller" href="formats-ouverts.php">next</a>
+   <a  class="button" href="what-is-at-stake-with-free-software.php">previous</a>
+   <a  class="button aller" href="open-formats.php">next</a>
   </div>
  <!-- fin contenu -->
   </div>
diff --git a/htdocs/en/logiciel-libre-contenu.php b/htdocs/en/logiciel-libre-contenu.php
index b349787..033aee5 100644
--- a/htdocs/en/logiciel-libre-contenu.php
+++ b/htdocs/en/logiciel-libre-contenu.php
@@ -21,7 +21,7 @@
 <!-- row 8 col - fin panneau -->
 <!-- debut navigation -->
   <div class="navigation">
-   <a  class="button aller" href="enjeux-du-logiciel-libre.php">next</a>
+   <a  class="button aller" href="what-is-at-stake-with-free-software.php">next</a>
   </div>
  <!-- fin contenu -->
   </div>
@@ -31,4 +31,4 @@
    <div class="large-2 columns"></div>
 </div>
 <!-- fin row 1  -->
-</section>
\ No newline at end of file
+</section>
diff --git a/htdocs/en/logiciels-libres-pour-education-contenu.php b/htdocs/en/logiciels-libres-pour-education-contenu.php
index 0f828dc..9cc2195 100644
--- a/htdocs/en/logiciels-libres-pour-education-contenu.php
+++ b/htdocs/en/logiciels-libres-pour-education-contenu.php
@@ -23,8 +23,8 @@ Using open formats and licensing educational resources under a free license enab
 <!-- row 8 col - fin panneau -->
 <!-- debut navigation -->
   <div class="navigation">
-   <a  class="button" href="formats-ouverts.php">previous</a>
-   <a  class="button aller" href="licences-logiciels-libres.php">next</a>
+   <a  class="button" href="open-formats.php">previous</a>
+   <a  class="button aller" href="free-licenses.php">next</a>
   </div>
  <!-- fin contenu -->
   </div>
@@ -34,4 +34,4 @@ Using open formats and licensing educational resources under a free license enab
    <div class="large-2 columns"></div>
 </div>
 <!-- fin row 1  -->
-</section>
\ No newline at end of file
+</section>
diff --git a/htdocs/en/modeles-libres-contenu.php b/htdocs/en/modeles-libres-contenu.php
index 517ab59..758085b 100644
--- a/htdocs/en/modeles-libres-contenu.php
+++ b/htdocs/en/modeles-libres-contenu.php
@@ -27,8 +27,8 @@ Whether in IT or elsewhere, the principles of Free Software have created a grass
 <!-- row 8 col - fin panneau -->
 <!-- debut navigation -->
   <div class="navigation">
-   <a  class="button" href="licences-logiciels-libres.php">previous</a>
-   <a  class="button aller" href="a-propos-april-et-expolibre.php">next</a>
+   <a  class="button" href="free-licenses.php">previous</a>
+   <a  class="button aller" href="about-april-and-libreexpo.php">next</a>
   </div>
  <!-- fin contenu -->
   </div>