diff --git a/Makefile b/Makefile
index 7e69e29546..9328b472a9 100644
--- a/Makefile
+++ b/Makefile
@@ -66,12 +66,13 @@ $(ENPAGES): %.html: %.xhtml fsfe.xsl navigation.en.xsl
 $(FRPAGES): %.html: %.xhtml fsfe.xsl navigation.fr.xsl
 	@$(ECHO) "Building $@ ..."; \
 	path=$< ; \
-	base=`expr $$path : '\(.*\).xhtml'` ; \
+	base=`expr $$path : '\(.*\).fr.xhtml'` ; \
 	filebase=`basename $$base` ; \
 	dir=`dirname $$path` ; \
 	root=`dirname $$path | perl -pe 'chop; s:([^/]+):..:g if($$_ ne ".")'` ; \
-	$(XSLTPROC) fsfe.xsl $$path $(XSLTOPTS) '$$fsfeurope='$$root '$$filebase='$$filebase '$$path='$$path > $$base.html-temp && (cat $$base.html-temp | perl -p -e '$$| = 1; (s/Date://, s/Author:/par/, s/\$$//g) if(/\$$''Date:/); s/mode: xml \*\*\*/mode: html \*\*\*/' > $$base.html) ; \
-	rm -f $$base.html-temp
+	langlinks="`./tools/translate.sh $$base fr`" ; \
+	$(XSLTPROC) fsfe.xsl $$path $(XSLTOPTS) '$$fsfeurope='$$root '$$filebase='$$filebase.fr '$$path='$$path '$$langlinks='"$$langlinks" > $$base.fr.html-temp && (cat $$base.fr.html-temp | perl -p -e '$$| = 1; (s/Date://, s/Author:/par/, s/\$$//g) if(/\$$''Date:/); s/mode: xml \*\*\*/mode: html \*\*\*/' > $$base.fr.html) ; \
+	rm -f $$base.fr.html-temp
 
 $(DEPAGES): %.html: %.xhtml fsfe.xsl navigation.de.xsl
 	@$(ECHO) "Building $@ ..."; \
diff --git a/background.fr.xhtml b/background.fr.xhtml
index 2bc7a2938a..2d9918e14c 100644
--- a/background.fr.xhtml
+++ b/background.fr.xhtml
@@ -9,16 +9,6 @@
   <body>
 
     <div> <!-- The header will be inserted here -->
-      <center>
-	[
-	<!-- Please update as needed and keep it in alphabetical order -->
-	<a href="background.de.html">Deutsch</a> |
-	<a href="background.html">English</a> |
-	Français |
-        <a href="background.pt.html">Português</a>
-	]
-      </center>
-
 <!-- Begin page content -->
 
           <h2>Contexte</h2>
diff --git a/boilerplate.fr.xhtml b/boilerplate.fr.xhtml
index a900e10516..354703e034 100644
--- a/boilerplate.fr.xhtml
+++ b/boilerplate.fr.xhtml
@@ -9,16 +9,6 @@
   <body>
 
     <div> <!-- The header will be inserted here -->
-      <center>
-	[
-	<!-- Please update as needed and keep it in alphabetical order -->
-        <a href="boilerplate.de.html">Deutsch</a> |
-        <a href="boilerplate.en.html">English</a> |
-        Français | 
-        <a href="boilerplate.pt.html">Português</a>
-	]
-      </center>
-
 <!-- Begin page content -->
 
 	<p>This rocks</p>
diff --git a/contact/contact.fr.xhtml b/contact/contact.fr.xhtml
index d877337045..cabccf243d 100644
--- a/contact/contact.fr.xhtml
+++ b/contact/contact.fr.xhtml
@@ -9,16 +9,6 @@
   <body>
 
     <div> <!-- The header will be inserted here -->
-      <center>
-	[
-	<!-- Please update as needed and keep it in alphabetical order -->
-	<a href="contact.de.html">Deutsch</a> |
-	<a href="contact.html">English</a> |
-	Français |
-        <a href="contact.pt.html">Português</a>
-	]
-      </center>
-
 <!-- Begin page content -->
           <h2>Discussions générales</h2>
 
diff --git a/coposys/index.fr.xhtml b/coposys/index.fr.xhtml
index 1c10d502f7..008955afc9 100644
--- a/coposys/index.fr.xhtml
+++ b/coposys/index.fr.xhtml
@@ -9,13 +9,6 @@
   <body>
 
     <div> <!-- The header will be inserted here -->
-      <center>
-	[
-	<!-- Please keep this list alphabetical -->
-	<a href="index.en.html">Anglais</a> | Français
-	]
-      </center>
-
       <blockquote>
 
         <p>Voici un outil de réprésentation graphique de l'emplacement
diff --git a/documents/documents.fr.xhtml b/documents/documents.fr.xhtml
index d3bace8f70..109dbde7d1 100644
--- a/documents/documents.fr.xhtml
+++ b/documents/documents.fr.xhtml
@@ -9,16 +9,6 @@
   <body>
 
     <div> <!-- The header will be inserted here -->
-      <center>
-	[
-	<!-- Please update as needed and keep it in alphabetical order -->
-        <a href="documents.de.html">Deutsch</a> |
-	<a href="documents.html">English</a> |
-        Français |
-        <a href="documents.pt.html">Português</a>
-	]
-      </center>
-
 <!-- Begin page content -->
     <div align="center">
     <h2>Documents</h2>
diff --git a/documents/doi.fr.xhtml b/documents/doi.fr.xhtml
index 0b6e8458ea..b9f8525e87 100644
--- a/documents/doi.fr.xhtml
+++ b/documents/doi.fr.xhtml
@@ -9,16 +9,6 @@
   <body>
 
     <div> <!-- The header will be inserted here -->
-      <center>
-	[
-	<!-- Please update as needed and keep it in alphabetical order -->
-	<a href="doi.de.html">Deutsch</a> |
-        <a href="doi.html">English</a> |
-        Français |
-        <a href="doi.pt.html">Português</a>
-	]
-      </center>
-
 <!-- Begin page content -->
     <div align="center">
     <h2>Déclaration d'Intention - Free Software Foundation Europe</h2>
diff --git a/documents/freesoftware.fr.xhtml b/documents/freesoftware.fr.xhtml
index 97265fca57..6e6099adb1 100644
--- a/documents/freesoftware.fr.xhtml
+++ b/documents/freesoftware.fr.xhtml
@@ -9,16 +9,6 @@
   <body>
 
     <div> <!-- The header will be inserted here -->
-      <center>
-	[
-	<!-- Please update as needed and keep it in alphabetical order -->
-        <a href="freesoftware.de.html">Deutsch</a> |
-        <a href="freesoftware.html">English</a> |
-	Français |
-        <a href="freesoftware.pt.html">Português</a>
-	]
-      </center>
-
 <!-- Begin page content -->
     <div align="center">
     <h2>Qu'est-ce que le Logiciel Libre ?</h2>
diff --git a/documents/gnuproject.fr.xhtml b/documents/gnuproject.fr.xhtml
index f8e18f90f4..84fed3d005 100644
--- a/documents/gnuproject.fr.xhtml
+++ b/documents/gnuproject.fr.xhtml
@@ -9,16 +9,6 @@
   <body>
 
     <div> <!-- The header will be inserted here -->
-      <center>
-	[
-	<!-- Please update as needed and keep it in alphabetical order -->
-        <a href="gnuproject.de.html">Deutsch</a> |
-	<a href="gnuproject.html">English</a> |
-	Français |
-	<a href="gnuproject.pt.html">Português</a>
-	]
-      </center>
-
 <!-- Begin page content -->
     <div align="center">
     <h2>Qu'est-ce que le Projet GNU?</h2>
diff --git a/documents/preamble.fr.xhtml b/documents/preamble.fr.xhtml
index 48044425b3..30715a0782 100644
--- a/documents/preamble.fr.xhtml
+++ b/documents/preamble.fr.xhtml
@@ -9,16 +9,6 @@
   <body>
 
     <div> <!-- The header will be inserted here -->
-      <center>
-	[
-	<!-- Please update as needed and keep it in alphabetical order -->
-        <a href="preamble.de.html">Deutsch</a> |
-        <a href="preamble.html">English</a> |
-        Français |
-        <a href="preamble.pt.html">Português</a>
-	]
-      </center>
-
 <!-- Begin page content -->
     <div align="center">
     <h2>Préambule</h2>
diff --git a/documents/whyfs-howto.fr.xhtml b/documents/whyfs-howto.fr.xhtml
index 22ab49ca80..ea5e5c6304 100644
--- a/documents/whyfs-howto.fr.xhtml
+++ b/documents/whyfs-howto.fr.xhtml
@@ -10,15 +10,6 @@
   <body>
 
     <div> <!-- The header will be inserted here -->
-      <center>
-	[
-	<!-- Please update as needed and keep it in alphabetical order -->
-        <a href="whyfs-howto.de.html">Deutsch</a> | 
-	<a href="whyfs-howto.en.html">English</a> |
-	Français  
-	]
-      </center>
-
 <!-- Begin page content -->
 
 <center><h2>Pourquoi nous parlons de Logiciel Libre</h2>
diff --git a/documents/whyfs.fr.xhtml b/documents/whyfs.fr.xhtml
index b7de879db4..fae690ae3d 100644
--- a/documents/whyfs.fr.xhtml
+++ b/documents/whyfs.fr.xhtml
@@ -10,18 +10,6 @@
   <body>
 
     <div> <!-- The header will be inserted here -->
-      <center>
-	[
-	<!-- Please update as needed and keep it in alphabetical order -->
-        <a href="whyfs.de.html">Deutsch</a> | 
-	<a href="whyfs.en.html">English</a> |
-	<a href="whyfs.es.html">Español</a> |
-        Français |
-	<a href="whyfs.it.html">Italiano</a> |
-	<a href="whyfs.pt.html">Português</a>
-	]
-      </center>
-
 <!-- Begin page content -->
 
 <center><h2>Pourquoi nous parlons de Logiciel Libre</h2></center>
diff --git a/education/argumentation.fr.xhtml b/education/argumentation.fr.xhtml
index edaf290996..547a1d64d6 100644
--- a/education/argumentation.fr.xhtml
+++ b/education/argumentation.fr.xhtml
@@ -9,16 +9,6 @@
   <body>
 
     <div> <!-- The header will be inserted here -->
-      <center>
-	[
-	<!-- Please update as needed and keep it in alphabetical order -->
-	<a href="argumentation.de.html">Deutsch</a> |
-	<a href="argumentation.html">English</a> |
-	Français <!--|
-        <a href="index.pt.html">Português</a> -->
-	]
-      </center>
-
 <!-- Begin page content -->
           <div align="center">
           <h2>Pourquoi préférer l'utilisation de logiciels libres dans l'Éducation?</h2>
diff --git a/education/education.fr.xhtml b/education/education.fr.xhtml
index ac0c85c0fc..217898ddab 100644
--- a/education/education.fr.xhtml
+++ b/education/education.fr.xhtml
@@ -9,16 +9,6 @@
 	<body>
 
 		<div> <!-- The header will be inserted here -->
-			<center>
-				[
-				<!-- Please update as needed and keep it in alphabetical order -->
-				<a href="education.de.html">Deutsch</a> |
-				<a href="education.html">English</a> |
-				Français<!-- |
-        <a href="index.pt.html">Português</a> -->
-				]
-			</center>
-
 			<!-- Begin page content -->
 			<div align="center">
 				<h2>Éducation</h2>
diff --git a/events/events.fr.xhtml b/events/events.fr.xhtml
index eddecfe705..c5f1ad8e2a 100644
--- a/events/events.fr.xhtml
+++ b/events/events.fr.xhtml
@@ -8,15 +8,6 @@
 	</head> 
 	<body> 
 		<div> <!-- The header will be inserted here --> 
-			<center> 
-				[ 
-				<!-- Please keep this list alphabetical --> 
-				<a href="events.de.html">Deutsch</a> | 
-				<a href="events.en.html">English</a> | 
-				Français 
-				] 
-			</center> 
-
 			<center>
 				<h2>Événements prévus</h2>
 			</center>
diff --git a/events/passed-2001.fr.xhtml b/events/passed-2001.fr.xhtml
index b0b3fc5419..ff2f42472a 100644
--- a/events/passed-2001.fr.xhtml
+++ b/events/passed-2001.fr.xhtml
@@ -9,15 +9,6 @@
 	<body> 
 
 		<div> <!-- The header will be inserted here --> 
-			<center> 
-				[ 
-				<!-- Please keep this list alphabetical --> 
-				<a href="passed-2001.de.html">Deutsch</a> | 
-				<a href="passed-2001.en.html">English</a> | 
-				Français 
-				] 
-			</center> 
-
 			<center>
 				<h2>Événements passés</h2>
 			</center> 
diff --git a/fr/eucd/eucd-fs.fr.xhtml b/fr/eucd/eucd-fs.fr.xhtml
index f6bc330985..f38d3f3bbe 100644
--- a/fr/eucd/eucd-fs.fr.xhtml
+++ b/fr/eucd/eucd-fs.fr.xhtml
@@ -9,15 +9,6 @@
   <body>
 
     <div> <!-- The header will be inserted here -->
-      <center>
-	[
-	<!-- Please update as needed and keep it in alphabetical order -->
-        <a href="eucd-fs.en.html">English</a> |
-        <a href="eucd-fs.es.html">Español</a> |
-        Français
-	]
-      </center>
-
 <!-- Begin page content -->
 
 <h1>Les extensions aux Droits d'Auteur en Europe menace le Logiciel Libre</h1> 
diff --git a/fr/eucd/eucd.fr.xhtml b/fr/eucd/eucd.fr.xhtml
index 33f9a7ebe5..9a561d4ecc 100644
--- a/fr/eucd/eucd.fr.xhtml
+++ b/fr/eucd/eucd.fr.xhtml
@@ -9,19 +9,6 @@
   <body>
 
     <div> <!-- The header will be inserted here -->
-       
-<!-- Autogenerated by preproc from eucd.fr.pxhtml -->
-	<center>
-	[
-	Deutsch
-	| <a href="eucd.en.html">English</a>
-	| Español
-	| Français
-	| Italiano
-	| Português
-	]
-	</center>
-
 <!-- Begin page content -->
 
       <h1>EUCD - Les extensions du droit d'auteur qui nous menacent</h1>
diff --git a/gbn/index.fr.xhtml b/gbn/index.fr.xhtml
index 84a32f6cc7..3e645bca6e 100644
--- a/gbn/index.fr.xhtml
+++ b/gbn/index.fr.xhtml
@@ -9,15 +9,6 @@
   <body>
 
     <div> <!-- The header will be inserted here -->
-      <center>
-        [
-	<a href="index.de.html">Deutsch</a> |
-	<a href="index.html">English</a> |
-	Français |
-        <a href="index.pt.html">Português</a>
-	]
-      </center>
-
 <!-- Begin page content -->
           <h2>GNU Business Network (Réseau d'affaires GNU)</h2>
 
diff --git a/index.fr.xhtml b/index.fr.xhtml
index 7e115cd7c1..11189663b9 100644
--- a/index.fr.xhtml
+++ b/index.fr.xhtml
@@ -10,19 +10,6 @@
   <body>
 
     <div> <!-- The header will be inserted here -->
-
-      <center>
-	[
-	<!-- Please update as needed and keep it in alphabetical order -->
-        <a href="index.de.html">Deutsch</a> |
-        <a href="index.html">English</a> |
-	<a href="index.es.html">Español</a> | 
-        Français |
-        <a href="index.it.html">Italiano</a> | 
-        <a href="index.pt.html">Português</a>
-	]
-      </center>
-
 <!-- Begin page content -->
 
           <center>
diff --git a/law/law.fr.xhtml b/law/law.fr.xhtml
index e7b0312b7b..94fddf2e8c 100644
--- a/law/law.fr.xhtml
+++ b/law/law.fr.xhtml
@@ -9,16 +9,6 @@
   <body>
 
     <div> <!-- The header will be inserted here -->
-      <center>
-	[
-	<!-- Please update as needed and keep it in alphabetical order -->
-	<a href="law.de.html">Deutsch</a> |
-	<a href="law.en.html">English</a> |
-        Français |
-        <a href="law.pt.html">Português</a>
-	]
-      </center>
-
 <!-- Begin page content -->
     <div align="center">
     <h2>Protéger le Logiciel Libre en Europe</h2>
diff --git a/mailman/index.fr.xhtml b/mailman/index.fr.xhtml
index 568cd1a2eb..c16966c1de 100644
--- a/mailman/index.fr.xhtml
+++ b/mailman/index.fr.xhtml
@@ -9,16 +9,6 @@
   <body>
 
     <div> <!-- The header will be inserted here -->
-      <center>
-	[
-	<!-- Please update as needed and keep it in alphabetical order -->
-	<a href="index.de.html">Deutsch</a> |
-	<a href="index.html">English</a> |
-        Français |
-        <a href="index.pt.html">Português</a>
-	]
-      </center>
-
 <!-- Begin page content -->
           <h2>A propos des listes de diffusion</h2>
           <p>
diff --git a/navigation.fr.xsl b/navigation.fr.xsl
index 84cef1a213..0f43e72a59 100644
--- a/navigation.fr.xsl
+++ b/navigation.fr.xsl
@@ -48,6 +48,9 @@
       <tr>
 	<td width="99%" valign="top">
         <div class="content">
+        <center>
+        <xsl:value-of select="$langlinks" disable-output-escaping="yes"/>
+        </center>
 	<xsl:apply-templates select="@*|node()"/>
         </div>
 	</td>
diff --git a/news/article2001-08-23-01.fr.xhtml b/news/article2001-08-23-01.fr.xhtml
index b03d5e9b28..79781d8c14 100644
--- a/news/article2001-08-23-01.fr.xhtml
+++ b/news/article2001-08-23-01.fr.xhtml
@@ -8,17 +8,6 @@
   <body>
 
     <div> <!-- The header will be inserted here -->
-      <center>
-	[
-	<!-- Please update as needed and keep it in alphabetical order -->
-        <a href="article2001-08-23-01.de.html">Deutsch</a> |
-        <a href="article2001-08-23-01.en.html">English</a> |
-        <a href="article2001-08-23-01.es.html">Español</a> |
-        Français |
-        <a href="article2001-08-23-01.it.html">Italian</a> |
-        <a href="article2001-08-23-01.pt.html">Português</a>
-	]
-      </center>
       <p />
       <blockquote>
 	<center><h2>Experts du Logiciel Libre</h2></center>
diff --git a/news/article2001-10-20-01.fr.xhtml b/news/article2001-10-20-01.fr.xhtml
index 252ea19508..21075f61b3 100644
--- a/news/article2001-10-20-01.fr.xhtml
+++ b/news/article2001-10-20-01.fr.xhtml
@@ -8,16 +8,6 @@
   <body>
 
     <div> <!-- The header will be inserted here -->
-      <center>
-	[
-	<!-- Please update as needed and keep it in alphabetical order -->
-        <a href="article2001-10-20-01.de.html">Deutsch</a> |
-        <a href="article2001-10-20-01.en.html">English</a> |
-        <a href="article2001-10-20-01.es.html">Español</a> |
-        Français |
-        <a href="article2001-10-20-01.pt.html">Português</a>
-	]
-      </center>
       <p />
       <blockquote>
 	<center><h2>La dérive de SourceForge</h2></center>
diff --git a/news/article2002-01-18-01.fr.xhtml b/news/article2002-01-18-01.fr.xhtml
index 03718685cf..1d9ff519e9 100644
--- a/news/article2002-01-18-01.fr.xhtml
+++ b/news/article2002-01-18-01.fr.xhtml
@@ -9,16 +9,6 @@
   <body>
 
     <div> <!-- The header will be inserted here -->
-      <center>
-	[ 
-	<!-- Please update as needed and keep it in alphabetical order --> 
-	<a href="article2002-01-18-01.en.html">English</a> |
-	<a href="article2002-01-18-01.es.html">Español</a> | 
-	Français | 
-	<a href="article2002-01-18-01.pt.html">Português</a> 
-	] 
-      </center>
-
       <!-- Begin page content -->
 
 <center>
diff --git a/news/news.fr.xhtml b/news/news.fr.xhtml
index 590206fa92..e7ed8e19a6 100644
--- a/news/news.fr.xhtml
+++ b/news/news.fr.xhtml
@@ -8,16 +8,6 @@
 	</head> 
 	<body> 
 		<div> <!-- The header will be inserted here --> 
-			<center> 
-				[ 
-				<!-- Please update as needed and keep it in alphabetical order --> 
-				<a href="news.de.html">Deutsch</a> | 
-				<a href="news.html">English</a> | 
-				Français | 
-				<a href="news.pt.html">Português</a>
-				] 
-			</center> 
-
 			<!-- Begin page content --> 
 
 			<div align="center">
diff --git a/press/index.fr.xhtml b/press/index.fr.xhtml
index 4a286a305b..63298cfc21 100644
--- a/press/index.fr.xhtml
+++ b/press/index.fr.xhtml
@@ -9,16 +9,6 @@
   <body>
 
     <div> <!-- The header will be inserted here -->
-      <center>
-	[
-	<!-- Please update as needed and keep it in alphabetical order -->
-	<a href="index.de.html">Deutsch</a> |
-        <a href="index.html">English</a> |
-        Français |
-        <a href="index.pt.html">Português</a>
-	]
-      </center>
-
 <!-- Begin page content -->
           <h2>Relations avec la Presse</h2>
 
diff --git a/speakers/speakers.fr.xhtml b/speakers/speakers.fr.xhtml
index 2b24629bc2..98bbb95b42 100644
--- a/speakers/speakers.fr.xhtml
+++ b/speakers/speakers.fr.xhtml
@@ -9,16 +9,6 @@
 	<body>
 
 		<div> <!-- The header will be inserted here -->
-			<center>
-				[
-				<!-- Please update as needed and keep it in alphabetical order -->
-				<a href="speakers.de.html">Deutsch</a> |
-				<a href="speakers.html">English</a> |
-				Français<!-- |
-				<a href="speakers.pt.html">Português</a> --> 
-				]
-			</center>
-
 			<!-- Begin page content --> 
 			<div align="center">
 				<h2>Intervenants</h2>