use translations from BRANCH

1 files changed, 60 insertions, 57 deletions

diff --git a/i18n/fr/libopie.ts b/i18n/fr/libopie.ts
index 9c79d97..89a970e 100644
--- a/i18n/fr/libopie.ts
+++ b/i18n/fr/libopie.ts
@@ -58,53 +58,53 @@
         <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>
+        <translation>Sat : </translation>
     </message>
     <message>
         <source>Val:</source>
-        <translation>Val :</translation>
+        <translation>Val : </translation>
     </message>
     <message>
         <source>Red:</source>
-        <translation>Rouge :</translation>
+        <translation>Rouge : </translation>
     </message>
     <message>
         <source>Green:</source>
-        <translation>Vert :</translation>
+        <translation>Vert : </translation>
     </message>
     <message>
         <source>Blue:</source>
-        <translation>Bleue :</translation>
+        <translation>Bleu : </translation>
     </message>
     <message>
         <source>Alpha channel:</source>
-        <translation>Canal Apha :</translation>
+        <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>
@@ -115,33 +115,33 @@
         <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>
+        <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>
@@ -171,65 +171,65 @@
         <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>
+        <translation>Répétition</translation>
     </message>
     <message>
         <source>None</source>
-        <translation>Sans</translation>
+        <translation>Aucune</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Jour</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semaine</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mois</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Année</translation>
     </message>
     <message>
         <source>Every:</source>
-        <translation>Tous les :</translation>
+        <translation>Chaque : </translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Fréquence</translation>
     </message>
     <message>
         <source>End On:</source>
-        <translation>Fin :</translation>
+        <translation>Fin : </translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Sans</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>
@@ -243,33 +243,33 @@
         <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>Every</source>
-        <translation>Tous</translation>
+        <translation>Chaque </translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>WeekVar</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
@@ -298,46 +298,47 @@
         <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>
+        <translation> et </translation>
     </message>
     <message>
         <source>,
 and </source>
-        <translation>, et</translation>
+        <translation>,
+et </translation>
     </message>
     <message>
         <source>, and </source>
-        <translation>, et</translation>
+        <translation>, et </translation>
     </message>
     <message>
         <source>on </source>
-        <translation>activé</translation>
+        <translation>Les </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>
@@ -379,243 +380,245 @@ and </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>
+        <translation>Chaque </translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
-        <translation>Heure :</translation>
+        <translation>Heure : </translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
-        <translation>Choisir l&apos;Heure :</translation>
+        <translation>Choisir 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>
+        <translation>Notes : </translation>
     </message>
     <message>
         <source>Priority:</source>
-        <translation>Priorité :</translation>
+        <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>
+        <translation>Etat : </translation>
     </message>
     <message>
         <source>Deadline:</source>
-        <translation>Délai :</translation>
+        <translation>Délai : </translation>
     </message>
     <message>
         <source>Category:</source>
-        <translation>Catégorie :</translation>
+        <translation>Catégorie : </translation>
     </message>
     <message>
         <source>Default Email: </source>
-        <translation>E-Mail par Défaut :</translation>
+        <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>
+        <translation>Service : </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
-        <translation>Page Web (bur):</translation>
+        <translation>Page Web (bur.):</translation>
     </message>
     <message>
         <source>Business Phone: </source>
-        <translation>Téléphone (bur):</translation>
+        <translation>Tél (bur.):</translation>
     </message>
     <message>
         <source>Business Fax: </source>
-        <translation>Fax (bur):</translation>
+        <translation>Fax (bur.):</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
-        <translation>Mobile (bur):</translation>
+        <translation>Mobile (bur.):</translation>
     </message>
     <message>
         <source>Business Pager: </source>
-        <translation>Radiomessage :</translation>
+        <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>
+        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Adresse (dom.):&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
-        <translation>Page Web (bur):</translation>
+        <translation>Page Web (bur.):</translation>
     </message>
     <message>
         <source>Home Phone: </source>
-        <translation>Téléphone (perso):</translation>
+        <translation>Téléphone (dom.):</translation>
     </message>
     <message>
         <source>Home Fax: </source>
-        <translation>Fax (perso):</translation>
+        <translation>Fax (dom.):</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Mobile (perso):</translation>
     </message>
     <message>
         <source>All Emails: </source>
-        <translation>EMail(s) :</translation>
+        <translation>E-Mail(s) : </translation>
     </message>
     <message>
         <source>Profession: </source>
-        <translation>Profession :</translation>
+        <translation>Profession : </translation>
     </message>
     <message>
         <source>Assistant: </source>
-        <translation>Assistant(e) :</translation>
+        <translation>Assistant(e) : </translation>
     </message>
     <message>
         <source>Manager: </source>
-        <translation>Responsable :</translation>
+        <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>
+        <translation>Type : </translation>
     </message>
     <message>
         <source>Spouse: </source>
-        <translation>Epouse :</translation>
+        <translation>Epou(x|se) : </translation>
     </message>
     <message>
         <source>Birthday: </source>
-        <translation>Date de Naissance :</translation>
+        <translation>Date de Naissance : </translation>
     </message>
     <message>
         <source>Anniversary: </source>
-        <translation>Autre Anniversaire :</translation>
+        <translation>Autre Anniversaire : </translation>
     </message>
     <message>
         <source>Children: </source>
-        <translation>Enfant :</translation>
+        <translation>Enfant(s) : </translation>
     </message>
     <message>
         <source>Nickname: </source>
-        <translation>Surnom :</translation>
+        <translation>Surnom : </translation>
     </message>
     <message>
         <source>Location:</source>
-        <translation>Lieu :</translation>
+        <translation>Lieu : </translation>
     </message>
     <message>
         <source>This is an all day event</source>
-        <translation>Cet événement couvre toute la journée</translation>
+        <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>
+        <translation>Cet événement couvre
+plusieurs jours</translation>
     </message>
     <message>
         <source>Start:</source>
-        <translation>Début :</translation>
+        <translation>Début : </translation>
     </message>
     <message>
         <source>End:</source>
-        <translation>Fin :</translation>
+        <translation>Fin : </translation>
     </message>
     <message>
         <source>Note:</source>
-        <translation>Note :</translation>
+        <translation>Note : </translation>
     </message>
     <message>
         <source>Every</source>
-        <translation>Tous</translation>
+        <translation>Chaque </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>
+        <translation>Le %2 %1 chaque </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>
@@ -628,32 +631,32 @@ and </source>
         <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>
+        <translation>,</translation>
     </message>
     <message>
         <source>nd</source>
-        <translation></translation>
+        <translation>,</translation>
     </message>
     <message>
         <source>rd</source>
-        <translation></translation>
+        <translation>,</translation>
     </message>
     <message>
         <source>th</source>
-        <translation></translation>
+        <translation>,</translation>
     </message>
 </context>
 </TS>