Merge from BRANCH_1_0.

1 files changed, 550 insertions, 0 deletions

diff --git a/i18n/fr/libopie.ts b/i18n/fr/libopie.ts
index 6cb9a3b..9c79d97 100644
--- a/i18n/fr/libopie.ts
+++ b/i18n/fr/libopie.ts
@@ -1,9 +1,189 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>Button</name>
+    <message>
+        <source>Calendar Button</source>
+        <translation>Bouton Agenda</translation>
+    </message>
+    <message>
+        <source>Contacts Button</source>
+        <translation>Bouton Contacts</translation>
+    </message>
+    <message>
+        <source>Menu Button</source>
+        <translation>Bouton Menu</translation>
+    </message>
+    <message>
+        <source>Mail Button</source>
+        <translation>Bouton E-Mail</translation>
+    </message>
+    <message>
+        <source>Home Button</source>
+        <translation>Bouton Home</translation>
+    </message>
+    <message>
+        <source>Record Button</source>
+        <translation>Bouton Enregistrement</translation>
+    </message>
+    <message>
+        <source>Display Rotate</source>
+        <translation>Rotation Ecran</translation>
+    </message>
+    <message>
+        <source>Lower+Up</source>
+        <translation>Haut</translation>
+    </message>
+    <message>
+        <source>Lower+Down</source>
+        <translation>Bas</translation>
+    </message>
+    <message>
+        <source>Lower+Right</source>
+        <translation>Droite</translation>
+    </message>
+    <message>
+        <source>Lower+Left</source>
+        <translation>Gauche</translation>
+    </message>
+    <message>
+        <source>Upper+Up</source>
+        <translation>Maj-Haut</translation>
+    </message>
+    <message>
+        <source>Upper+Down</source>
+        <translation>Maj-Bas</translation>
+    </message>
+    <message>
+        <source>Upper+Right</source>
+        <translation>Maj-Droite</translation>
+    </message>
+    <message>
+        <source>Upper+Left</source>
+        <translation>Maj-Gauche</translation>
+    </message>
+</context>
+<context>
+    <name>OColorDialog</name>
+    <message>
+        <source>Hue:</source>
+        <translation>Nuance:</translation>
+    </message>
+    <message>
+        <source>Sat:</source>
+        <translation>Sat :</translation>
+    </message>
+    <message>
+        <source>Val:</source>
+        <translation>Val :</translation>
+    </message>
+    <message>
+        <source>Red:</source>
+        <translation>Rouge :</translation>
+    </message>
+    <message>
+        <source>Green:</source>
+        <translation>Vert :</translation>
+    </message>
+    <message>
+        <source>Blue:</source>
+        <translation>Bleue :</translation>
+    </message>
+    <message>
+        <source>Alpha channel:</source>
+        <translation>Canal Apha :</translation>
+    </message>
+    <message>
+        <source>Select color</source>
+        <translation>Sélectionner Couleur</translation>
+    </message>
+</context>
+<context>
+    <name>OColorPopupMenu</name>
+    <message>
+        <source>More</source>
+        <translation>Ajouter</translation>
+    </message>
+    <message>
+        <source>More...</source>
+        <translation>Ajouter...</translation>
+    </message>
+</context>
+<context>
+    <name>OFileDialog</name>
+    <message>
+        <source>FileDialog</source>
+        <translation>Sélection Fichier</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Ouvrir</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Enregistrer</translation>
+    </message>
+</context>
+<context>
+    <name>OFileSelector</name>
+    <message>
+        <source>Name:</source>
+        <translation>Nom :</translation>
+    </message>
+</context>
+<context>
+    <name>OFileViewFileListView</name>
+    <message>
+        <source>Name</source>
+        <translation>Nom</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Taille</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Date</translation>
+    </message>
+    <message>
+        <source>Mime Type</source>
+        <translation>Type Mime</translation>
+    </message>
+</context>
+<context>
+    <name>OFontMenu</name>
+    <message>
+        <source>Large</source>
+        <translation>Grande</translation>
+    </message>
+    <message>
+        <source>Medium</source>
+        <translation>Moyenne</translation>
+    </message>
+    <message>
+        <source>Small</source>
+        <translation>Petite</translation>
+    </message>
+</context>
+<context>
+    <name>OFontSelector</name>
+    <message>
+        <source>Style</source>
+        <translation>Style</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Taille</translation>
+    </message>
+    <message>
+        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <translation>The Quick Brown Fox Jumps Over The Lazy Dog</translation>
+    </message>
+</context>
+<context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Répéter Evènement</translation>
     </message>
     <message>
@@ -89,12 +269,136 @@
     <message>
         <source>WeekVar</source>
         <translation>WeekVar</translation>
     </message>
 </context>
 <context>
+    <name>ORecurranceWidget</name>
+    <message>
+        <source>No End Date</source>
+        <translation>A l&apos;Infini</translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation>jours</translation>
+    </message>
+    <message>
+        <source>day</source>
+        <translation>jour</translation>
+    </message>
+    <message>
+        <source>weeks</source>
+        <translation>semaines</translation>
+    </message>
+    <message>
+        <source>week</source>
+        <translation>semaine</translation>
+    </message>
+    <message>
+        <source>months</source>
+        <translation>mois</translation>
+    </message>
+    <message>
+        <source>month</source>
+        <translation>mois</translation>
+    </message>
+    <message>
+        <source>years</source>
+        <translation>années</translation>
+    </message>
+    <message>
+        <source>year</source>
+        <translation>année</translation>
+    </message>
+    <message>
+        <source> and </source>
+        <translation>et</translation>
+    </message>
+    <message>
+        <source>,
+and </source>
+        <translation>, et</translation>
+    </message>
+    <message>
+        <source>, and </source>
+        <translation>, et</translation>
+    </message>
+    <message>
+        <source>on </source>
+        <translation>activé</translation>
+    </message>
+    <message>
+        <source>No Repeat</source>
+        <translation>Pas de Répétition</translation>
+    </message>
+    <message>
+        <source>day(s)</source>
+        <translation>jour(s)</translation>
+    </message>
+    <message>
+        <source>Repeat On</source>
+        <translation>Répéter</translation>
+    </message>
+    <message>
+        <source>Mon</source>
+        <translation>Lu</translation>
+    </message>
+    <message>
+        <source>Tue</source>
+        <translation>Ma</translation>
+    </message>
+    <message>
+        <source>Wed</source>
+        <translation>Me</translation>
+    </message>
+    <message>
+        <source>Thu</source>
+        <translation>Je</translation>
+    </message>
+    <message>
+        <source>Fri</source>
+        <translation>Ve</translation>
+    </message>
+    <message>
+        <source>Sat</source>
+        <translation>Sa</translation>
+    </message>
+    <message>
+        <source>Sun</source>
+        <translation>Di</translation>
+    </message>
+    <message>
+        <source>week(s)</source>
+        <translation>semaine(s)</translation>
+    </message>
+    <message>
+        <source>Repeat By</source>
+        <translation>Type Répétition</translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation>Jour</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Date</translation>
+    </message>
+    <message>
+        <source>month(s)</source>
+        <translation>mois</translation>
+    </message>
+    <message>
+        <source>year(s)</source>
+        <translation>année(s)</translation>
+    </message>
+    <message>
+        <source>Every</source>
+        <translation>Tous</translation>
+    </message>
+</context>
+<context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Heure :</translation>
     </message>
     <message>
@@ -103,7 +407,253 @@
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Choisir l&apos;Heure :</translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Documents</source>
+        <translation>Documents</translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation>Fichiers</translation>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation>Tous les Fichiers</translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation>Notes :</translation>
+    </message>
+    <message>
+        <source>Priority:</source>
+        <translation>Priorité :</translation>
+    </message>
+    <message>
+        <source>Very high</source>
+        <translation>Très haute</translation>
+    </message>
+    <message>
+        <source>High</source>
+        <translation>Haute</translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation>Normale</translation>
+    </message>
+    <message>
+        <source>Low</source>
+        <translation>Faible</translation>
+    </message>
+    <message>
+        <source>Very low</source>
+        <translation>Très Faible</translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation>Etat :</translation>
+    </message>
+    <message>
+        <source>Deadline:</source>
+        <translation>Délai :</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation>Catégorie :</translation>
+    </message>
+    <message>
+        <source>Default Email: </source>
+        <translation>E-Mail par Défaut :</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Adresse (bur):&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Office: </source>
+        <translation>Bureau :</translation>
+    </message>
+    <message>
+        <source>Business Web Page: </source>
+        <translation>Page Web (bur):</translation>
+    </message>
+    <message>
+        <source>Business Phone: </source>
+        <translation>Téléphone (bur):</translation>
+    </message>
+    <message>
+        <source>Business Fax: </source>
+        <translation>Fax (bur):</translation>
+    </message>
+    <message>
+        <source>Business Mobile: </source>
+        <translation>Mobile (bur):</translation>
+    </message>
+    <message>
+        <source>Business Pager: </source>
+        <translation>Radiomessage :</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Adresse (perso):&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Home Web Page: </source>
+        <translation>Page Web (bur):</translation>
+    </message>
+    <message>
+        <source>Home Phone: </source>
+        <translation>Téléphone (perso):</translation>
+    </message>
+    <message>
+        <source>Home Fax: </source>
+        <translation>Fax (perso):</translation>
+    </message>
+    <message>
+        <source>Home Mobile: </source>
+        <translation>Mobile (perso):</translation>
+    </message>
+    <message>
+        <source>All Emails: </source>
+        <translation>EMail(s) :</translation>
+    </message>
+    <message>
+        <source>Profession: </source>
+        <translation>Profession :</translation>
+    </message>
+    <message>
+        <source>Assistant: </source>
+        <translation>Assistant(e) :</translation>
+    </message>
+    <message>
+        <source>Manager: </source>
+        <translation>Responsable :</translation>
+    </message>
+    <message>
+        <source>Male</source>
+        <translation>Homme</translation>
+    </message>
+    <message>
+        <source>Female</source>
+        <translation>Femme</translation>
+    </message>
+    <message>
+        <source>Gender: </source>
+        <translation>sexe :</translation>
+    </message>
+    <message>
+        <source>Spouse: </source>
+        <translation>Epouse :</translation>
+    </message>
+    <message>
+        <source>Birthday: </source>
+        <translation>Date de Naissance :</translation>
+    </message>
+    <message>
+        <source>Anniversary: </source>
+        <translation>Autre Anniversaire :</translation>
+    </message>
+    <message>
+        <source>Children: </source>
+        <translation>Enfant :</translation>
+    </message>
+    <message>
+        <source>Nickname: </source>
+        <translation>Surnom :</translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation>Lieu :</translation>
+    </message>
+    <message>
+        <source>This is an all day event</source>
+        <translation>Cet événement couvre toute la journée</translation>
+    </message>
+    <message>
+        <source>This is a multiple day event</source>
+        <translation>Cet événement couvre plusieurs jours</translation>
+    </message>
+    <message>
+        <source>Start:</source>
+        <translation>Début :</translation>
+    </message>
+    <message>
+        <source>End:</source>
+        <translation>Fin :</translation>
+    </message>
+    <message>
+        <source>Note:</source>
+        <translation>Note :</translation>
+    </message>
+    <message>
+        <source>Every</source>
+        <translation>Tous</translation>
+    </message>
+    <message>
+        <source>%1 %2 every </source>
+        <translation>%1 %2 chaque</translation>
+    </message>
+    <message>
+        <source>The %1 every </source>
+        <translation>Le %1 chaque</translation>
+    </message>
+    <message>
+        <source>The %1 %2 of every</source>
+        <translation>Le %1 %2 tous les</translation>
+    </message>
+    <message>
+        <source>Every </source>
+        <translation>Chaque</translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation>Lundi</translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <translation>Mardi</translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <translation>Mercredi</translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <translation>Jeudi</translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <translation>Vendredi</translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <translation>Samedi</translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation>Dimanche</translation>
+    </message>
+</context>
+<context>
+    <name>QWidget</name>
+    <message>
+        <source>st</source>
+        <translation>er</translation>
+    </message>
+    <message>
+        <source>nd</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>rd</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>th</source>
+        <translation></translation>
+    </message>
+</context>
 </TS>