3 files changed, 330 insertions, 264 deletions

diff --git a/fr_FR.ISO8859-1/share/sgml/mirrors-local.xsl b/fr_FR.ISO8859-1/share/sgml/mirrors-local.xsl
index 13c2d2364b..b2959dec5b 100644
--- a/fr_FR.ISO8859-1/share/sgml/mirrors-local.xsl
+++ b/fr_FR.ISO8859-1/share/sgml/mirrors-local.xsl
@@ -17,11 +17,6 @@
 	      omit-xml-declaration="yes"
 	      indent="yes"/>
 
-  <!-- these params should be externally bound. The values
-       here are not used actually -->
-  <xsl:param name="proto" select="''" />
-  <xsl:param name="target" select="''" />
-
   <!-- template: "mirrors-docbook-contact" -->
 
   <xsl:template name="mirrors-docbook-contact">
diff --git a/fr_FR.ISO8859-1/share/sgml/transtable-local.xsl b/fr_FR.ISO8859-1/share/sgml/transtable-local.xsl
index 3b8fe3c94e..9bf94bca25 100644
--- a/fr_FR.ISO8859-1/share/sgml/transtable-local.xsl
+++ b/fr_FR.ISO8859-1/share/sgml/transtable-local.xsl
@@ -3,7 +3,7 @@
 
 <!--
      The FreeBSD French Documentation Project
-     Original revision: 1.1
+     Original revision: 1.2
 
      Version francaise : Stephane Legrand <stephane@freebsd-fr.org>
 -->
@@ -19,5 +19,10 @@
   <!-- these params should be externally bound. The values
        here are not used actually -->
   <xsl:param name="transtable.xml" select="'./transtable.xml'" />
-  <xsl:param name="transtable-conv-element" select="''" />
+  <xsl:param name="transtable-sortkey.xml" select="'./transtable-sortkey.xml'" />
+
+  <xsl:param name="transtable-target-element" select="''" />
+  <xsl:param name="transtable-word-group" select="''" />
+  <xsl:param name="transtable-mode" select="''" />
+
 </xsl:stylesheet>
diff --git a/fr_FR.ISO8859-1/share/sgml/transtable.xml b/fr_FR.ISO8859-1/share/sgml/transtable.xml
index dbd18957f6..8b21635929 100644
--- a/fr_FR.ISO8859-1/share/sgml/transtable.xml
+++ b/fr_FR.ISO8859-1/share/sgml/transtable.xml
@@ -3,26 +3,28 @@
 
 <!--
      The FreeBSD French Documentation Project
-     Original revision: 1.1
+     Original revision: 1.2
 
      Version francaise : Stephane Legrand <stephane@freebsd-fr.org>
 -->
 
 <!--
 
-  This is a translation table used in transtable-master.xsl.
+  This is a translation table used in transtable-common.xsl.
   For example:
 
-  <word>
-    <orig>word in English)</orig>
-    <tran>word in your language</tran>
-  </word>
+  <group id="word-group">
+    <word>
+      <orig>word in English</orig>
+      <tran>word in your language</tran>
+    </word>
+  </group>
 
 -->
 
 <transtable>
-  <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
-    <cvs:keyword name="freebsd">
+  <cvs:keywords>
+    <cvs:keyword>
       $FreeBSD$
     </cvs:keyword>
   </cvs:keywords>
@@ -34,254 +36,318 @@
   </word>
 -->
 
-  <word>
-    <orig>Central Servers</orig>
-    <tran>Serveurs primaires</tran>
-  </word>
-
-  <word>
-    <orig>Primary Mirror Sites</orig>
-    <tran>Sites miroirs primaires</tran>
-  </word>
-
-  <word>
-    <orig>Argentina</orig>
-    <tran>Argentine</tran>
-  </word>
-
-  <word>
-    <orig>Australia</orig>
-    <tran>Australie</tran>
-  </word>
-
-  <word>
-    <orig>Austria</orig>
-    <tran>Autriche</tran>
-  </word>
-
-  <word>
-    <orig>Belgium</orig>
-    <tran>Belgique</tran>
-  </word>
-
-  <word>
-    <orig>Brazil</orig>
-    <tran>Br&#233;sil</tran>
-  </word>
-
-  <word>
-    <orig>Bulgaria</orig>
-    <tran>Bulgarie</tran>
-  </word>
-
-  <word>
-    <orig>Canada</orig>
-    <tran>Canada</tran>
-  </word>
-
-  <word>
-    <orig>China</orig>
-    <tran>Chine</tran>
-  </word>
-
-  <word>
-    <orig>Croatia</orig>
-    <tran>Croatie</tran>
-  </word>
-
-  <word>
-    <orig>Czech Republic</orig>
-    <tran>R&#233;publique Tch&#232;que</tran>
-  </word>
-
-  <word>
-    <orig>Denmark</orig>
-    <tran>Danemark</tran>
-  </word>
-
-  <word>
-    <orig>Estonia</orig>
-    <tran>Estonie</tran>
-  </word>
-
-  <word>
-    <orig>Finland</orig>
-    <tran>Finlande</tran>
-  </word>
-
-  <word>
-    <orig>France</orig>
-    <tran>France</tran>
-  </word>
-
-  <word>
-    <orig>Germany</orig>
-    <tran>Allemagne</tran>
-  </word>
-
-  <word>
-    <orig>Greece</orig>
-    <tran>Gr&#232;ce</tran>
-  </word>
-
-  <word>
-    <orig>Hong Kong</orig>
-    <tran>Hong-Kong</tran>
-  </word>
-
-  <word>
-    <orig>Hungary</orig>
-    <tran>Hongrie</tran>
-  </word>
-
-  <word>
-    <orig>Iceland</orig>
-    <tran>Islande</tran>
-  </word>
-
-  <word>
-    <orig>Ireland</orig>
-    <tran>Irlande</tran>
-  </word>
-
-  <word>
-    <orig>Italy</orig>
-    <tran>Italie</tran>
-  </word>
-
-  <word>
-    <orig>Japan</orig>
-    <tran>Japon</tran>
-  </word>
-
-  <word>
-    <orig>Korea</orig>
-    <tran>Cor&#233;e</tran>
-  </word>
-
-  <word>
-    <orig>Kuwait</orig>
-    <tran>Kowe&#239;t</tran>
-  </word>
-
-  <word>
-    <orig>Latvia</orig>
-    <tran>Lettonie</tran>
-  </word>
-
-  <word>
-    <orig>Lithuania</orig>
-    <tran>Lituanie</tran>
-  </word>
-
-  <word>
-    <orig>Netherlands</orig>
-    <tran>Pays-Bas</tran>
-  </word>
-
-  <word>
-    <orig>New Zealand</orig>
-    <tran>Nouvelle-Z&#233;lande</tran>
-  </word>
-
-  <word>
-    <orig>Norway</orig>
-    <tran>Norv&#232;ge</tran>
-  </word>
-
-  <word>
-    <orig>Philippines</orig>
-    <tran>Philippines</tran>
-  </word>
-
-  <word>
-    <orig>Poland</orig>
-    <tran>Pologne</tran>
-  </word>
-
-  <word>
-    <orig>Portugal</orig>
-    <tran>Portugal</tran>
-  </word>
-
-  <word>
-    <orig>Romania</orig>
-    <tran>Roumanie</tran>
-  </word>
-
-  <word>
-    <orig>Russia</orig>
-    <tran>Russie</tran>
-  </word>
-
-  <word>
-    <orig>San Marino</orig>
-    <tran>San Marin</tran>
-  </word>
-
-  <word>
-    <orig>Saudi Arabia</orig>
-    <tran>Arabie Saoudite</tran>
-  </word>
-
-  <word>
-    <orig>Singapore</orig>
-    <tran>Singapour</tran>
-  </word>
-
-  <word>
-    <orig>Slovak Republic</orig>
-    <tran>R&#233;publique Slovaque</tran>
-  </word>
-
-  <word>
-    <orig>Slovenia</orig>
-    <tran>Slov&#233;nie</tran>
-  </word>
-
-  <word>
-    <orig>South Africa</orig>
-    <tran>Afrique du Sud</tran>
-  </word>
-
-  <word>
-    <orig>Spain</orig>
-    <tran>Espagne</tran>
-  </word>
-
-  <word>
-    <orig>Sweden</orig>
-    <tran>Su&#232;de</tran>
-  </word>
-
-  <word>
-    <orig>Switzerland</orig>
-    <tran>Suisse</tran>
-  </word>
-
-  <word>
-    <orig>Taiwan</orig>
-    <tran>Ta&#239;wan</tran>
-  </word>
-
-  <word>
-    <orig>Turkey</orig>
-    <tran>Turquie</tran>
-  </word>
-
-  <word>
-    <orig>Ukraine</orig>
-    <tran>Ukraine</tran>
-  </word>
-
-  <word>
-    <orig>United Kingdom</orig>
-    <tran>Royaume-Uni</tran>
-  </word>
-
-  <word>
-    <orig>USA</orig>
-    <tran>USA</tran>
-  </word>
+  <group id="country">
+    <word>
+      <orig>Central Servers</orig>
+      <tran>Serveurs primaires</tran>
+    </word>
+
+    <word>
+      <orig>Primary Mirror Sites</orig>
+      <tran>Sites miroirs primaires</tran>
+    </word>
+
+    <word>
+      <orig>Argentina</orig>
+      <tran>Argentine</tran>
+    </word>
+
+    <word>
+      <orig>Australia</orig>
+      <tran>Australie</tran>
+    </word>
+
+    <word>
+      <orig>Austria</orig>
+      <tran>Autriche</tran>
+    </word>
+
+    <word>
+      <orig>Belgium</orig>
+      <tran>Belgique</tran>
+    </word>
+
+    <word>
+      <orig>Brazil</orig>
+      <tran>Br&#233;sil</tran>
+    </word>
+
+    <word>
+      <orig>Bulgaria</orig>
+      <tran>Bulgarie</tran>
+    </word>
+
+    <word>
+      <orig>Canada</orig>
+      <tran>Canada</tran>
+    </word>
+
+    <word>
+      <orig>China</orig>
+      <tran>Chine</tran>
+    </word>
+
+    <word>
+      <orig>Croatia</orig>
+      <tran>Croatie</tran>
+    </word>
+
+    <word>
+      <orig>Czech Republic</orig>
+      <tran>R&#233;publique Tch&#232;que</tran>
+    </word>
+
+    <word>
+      <orig>Denmark</orig>
+      <tran>Danemark</tran>
+    </word>
+
+    <word>
+      <orig>Estonia</orig>
+      <tran>Estonie</tran>
+    </word>
+
+    <word>
+      <orig>Finland</orig>
+      <tran>Finlande</tran>
+    </word>
+
+    <word>
+      <orig>France</orig>
+      <tran>France</tran>
+    </word>
+
+    <word>
+      <orig>Germany</orig>
+      <tran>Allemagne</tran>
+    </word>
+
+    <word>
+      <orig>Greece</orig>
+      <tran>Gr&#232;ce</tran>
+    </word>
+
+    <word>
+      <orig>Hong Kong</orig>
+      <tran>Hong-Kong</tran>
+    </word>
+
+    <word>
+      <orig>Hungary</orig>
+      <tran>Hongrie</tran>
+    </word>
+
+    <word>
+      <orig>Iceland</orig>
+      <tran>Islande</tran>
+    </word>
+
+    <word>
+      <orig>Ireland</orig>
+      <tran>Irlande</tran>
+    </word>
+
+    <word>
+      <orig>Italy</orig>
+      <tran>Italie</tran>
+    </word>
+
+    <word>
+      <orig>Japan</orig>
+      <tran>Japon</tran>
+    </word>
+
+    <word>
+      <orig>Korea</orig>
+      <tran>Cor&#233;e</tran>
+    </word>
+
+    <word>
+      <orig>Kuwait</orig>
+      <tran>Kowe&#239;t</tran>
+    </word>
+
+    <word>
+      <orig>Latvia</orig>
+      <tran>Lettonie</tran>
+    </word>
+
+    <word>
+      <orig>Lithuania</orig>
+      <tran>Lituanie</tran>
+    </word>
+
+    <word>
+      <orig>Netherlands</orig>
+      <tran>Pays-Bas</tran>
+    </word>
+
+    <word>
+      <orig>New Zealand</orig>
+      <tran>Nouvelle-Z&#233;lande</tran>
+    </word>
+
+    <word>
+      <orig>Norway</orig>
+      <tran>Norv&#232;ge</tran>
+    </word>
+
+    <word>
+      <orig>Philippines</orig>
+      <tran>Philippines</tran>
+    </word>
+
+    <word>
+      <orig>Poland</orig>
+      <tran>Pologne</tran>
+    </word>
+
+    <word>
+      <orig>Portugal</orig>
+      <tran>Portugal</tran>
+    </word>
+
+    <word>
+      <orig>Romania</orig>
+      <tran>Roumanie</tran>
+    </word>
+
+    <word>
+      <orig>Russia</orig>
+      <tran>Russie</tran>
+    </word>
+
+    <word>
+      <orig>San Marino</orig>
+      <tran>San Marin</tran>
+    </word>
+
+    <word>
+      <orig>Saudi Arabia</orig>
+      <tran>Arabie Saoudite</tran>
+    </word>
+
+    <word>
+      <orig>Singapore</orig>
+      <tran>Singapour</tran>
+    </word>
+
+    <word>
+      <orig>Slovak Republic</orig>
+      <tran>R&#233;publique Slovaque</tran>
+    </word>
+
+    <word>
+      <orig>Slovenia</orig>
+      <tran>Slov&#233;nie</tran>
+    </word>
+
+    <word>
+      <orig>South Africa</orig>
+      <tran>Afrique du Sud</tran>
+    </word>
+
+    <word>
+      <orig>Spain</orig>
+      <tran>Espagne</tran>
+    </word>
+
+    <word>
+      <orig>Sweden</orig>
+      <tran>Su&#232;de</tran>
+    </word>
+
+    <word>
+      <orig>Switzerland</orig>
+      <tran>Suisse</tran>
+    </word>
+
+    <word>
+      <orig>Taiwan</orig>
+      <tran>Ta&#239;wan</tran>
+    </word>
+
+    <word>
+      <orig>Turkey</orig>
+      <tran>Turquie</tran>
+    </word>
+
+    <word>
+      <orig>Ukraine</orig>
+      <tran>Ukraine</tran>
+    </word>
+
+    <word>
+      <orig>United Kingdom</orig>
+      <tran>Royaume-Uni</tran>
+    </word>
+
+    <word>
+      <orig>USA</orig>
+      <tran>USA</tran>
+    </word>
+  </group>
+
+  <group id="number-month">
+    <word>
+      <orig>1</orig>
+      <tran>Janvier</tran>
+    </word>
+
+    <word>
+      <orig>2</orig>
+      <tran>F&#233;vrier</tran>
+    </word>
+
+    <word>
+      <orig>3</orig>
+      <tran>Mars</tran>
+    </word>
+
+    <word>
+      <orig>4</orig>
+      <tran>Avril</tran>
+    </word>
+
+    <word>
+      <orig>5</orig>
+      <tran>Mai</tran>
+    </word>
+
+    <word>
+      <orig>6</orig>
+      <tran>Juin</tran>
+    </word>
+
+    <word>
+      <orig>7</orig>
+      <tran>Juillet</tran>
+    </word>
+
+    <word>
+      <orig>8</orig>
+      <tran>Ao&#251;t</tran>
+    </word>
+
+    <word>
+      <orig>9</orig>
+      <tran>Septembre</tran>
+    </word>
+
+    <word>
+      <orig>10</orig>
+      <tran>Octobre</tran>
+    </word>
+
+    <word>
+      <orig>11</orig>
+      <tran>Novembre</tran>
+    </word>
+
+    <word>
+      <orig>12</orig>
+      <tran>D&#233;cembre</tran>
+    </word>
+  </group>
 
 </transtable>