Merge from BRANCH_1_0.

1 files changed, 34 insertions, 7 deletions

diff --git a/i18n/fr/datebook.ts b/i18n/fr/datebook.ts
index 124dc79..26b4deb 100644
--- a/i18n/fr/datebook.ts
+++ b/i18n/fr/datebook.ts
@@ -93,12 +93,16 @@ Quitter ?</translation>
         <translation>Dupliquer évènement</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Éditer...</translation>
     </message>
+    <message>
+        <source>error box</source>
+        <translation>boîte d&apos;erreur</translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>L</translation>
@@ -190,12 +194,16 @@ Quitter ?</translation>
         <translation>-</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Dupliquer</translation>
     </message>
+    <message>
+        <source>Beam this occurence</source>
+        <translation>Emettre cet élément</translation>
+    </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 Après-midi</translation>
@@ -355,12 +363,20 @@ Quitter ?</translation>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Jan-00. Jan</translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekLstDayHdr</name>
+    <message>
+        <source>MTWTFSSM</source>
+        <comment>Week days</comment>
+        <translation>LMMJVSDL</translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>w</translation>
     </message>
 </context>
@@ -377,43 +393,43 @@ Quitter ?</translation>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>M</source>
         <comment>Monday</comment>
-        <translation>L</translation>
+        <translation type="obsolete">L</translation>
     </message>
     <message>
         <source>T</source>
         <comment>Tuesday</comment>
-        <translation>M</translation>
+        <translation type="obsolete">M</translation>
     </message>
     <message>
         <source>W</source>
         <comment>Wednesday</comment>
-        <translation>M</translation>
+        <translation type="obsolete">M</translation>
     </message>
     <message>
         <source>T</source>
         <comment>Thursday</comment>
-        <translation>J</translation>
+        <translation type="obsolete">J</translation>
     </message>
     <message>
         <source>F</source>
         <comment>Friday</comment>
-        <translation>V</translation>
+        <translation type="obsolete">V</translation>
     </message>
     <message>
         <source>S</source>
         <comment>Saturday</comment>
-        <translation>S</translation>
+        <translation type="obsolete">S</translation>
     </message>
     <message>
         <source>S</source>
         <comment>Sunday</comment>
-        <translation>D</translation>
+        <translation type="obsolete">D</translation>
     </message>
     <message>
         <source>p</source>
         <translation>p</translation>
     </message>
 </context>
@@ -549,12 +565,19 @@ Minutes</translation>
     <message>
         <source>Note...</source>
         <translation>Notes...</translation>
     </message>
 </context>
 <context>
+    <name>DatebookAlldayDisp</name>
+    <message>
+        <source>Info</source>
+        <translation>Info</translation>
+    </message>
+</context>
+<context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Editer la note</translation>
     </message>
     <message>
@@ -709,12 +732,16 @@ and </source>
 et</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, et</translation>
     </message>
+    <message>
+        <source>on </source>
+        <translation>activé</translation>
+    </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Evénement qui se répète</translation>