Merge from BRANCH_1_0.

1 files changed, 45 insertions, 18 deletions

diff --git a/i18n/it/datebook.ts b/i18n/it/datebook.ts
index 45d9098..f52786f 100644
--- a/i18n/it/datebook.ts
+++ b/i18n/it/datebook.ts
@@ -83,32 +83,36 @@ Uscire comunque?</translation>
     <message>
         <source>Fix it</source>
         <translation>Ripara</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Continua</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation>Copia Evento</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Modifica...</translation>
     </message>
+    <message>
+        <source>error box</source>
+        <translation>box di errore</translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>L</translation>
     </message>
     <message>
         <source>T</source>
         <translation>M</translation>
     </message>
     <message>
         <source>W</source>
         <translation>M</translation>
     </message>
     <message>
@@ -180,32 +184,36 @@ Uscire comunque?</translation>
     <message>
         <source>Beam</source>
         <translation>Trasmetti via IrDA</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Orario</translation>
     </message>
     <message>
         <source> - </source>
         <translation> - </translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Copia</translation>
     </message>
+    <message>
+        <source>Beam this occurence</source>
+        <translation>Trasmetti questa occorrenza</translation>
+    </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 PM</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
@@ -345,89 +353,97 @@ Uscire comunque?</translation>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>w</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Gen-00. Gen</translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekLstDayHdr</name>
+    <message>
+        <source>MTWTFSSM</source>
+        <comment>Week days</comment>
+        <translation>LMMGVSDL</translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>w</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>S: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
-        <source>M</source>
+        <source>p</source>
+        <translation>p</translation>
+    </message>
+    <message>
+        <source>Mo</source>
         <comment>Monday</comment>
-        <translation>L</translation>
+        <translation type="obsolete">Lun</translation>
     </message>
     <message>
-        <source>T</source>
+        <source>Tu</source>
         <comment>Tuesday</comment>
-        <translation>M</translation>
+        <translation type="obsolete">Mar</translation>
     </message>
     <message>
-        <source>W</source>
+        <source>We</source>
         <comment>Wednesday</comment>
-        <translation>M</translation>
+        <translation type="obsolete">Mer</translation>
     </message>
     <message>
-        <source>T</source>
+        <source>Th</source>
         <comment>Thursday</comment>
-        <translation>G</translation>
+        <translation type="obsolete">Gio</translation>
     </message>
     <message>
-        <source>F</source>
+        <source>Fr</source>
         <comment>Friday</comment>
-        <translation>V</translation>
+        <translation type="obsolete">Ven</translation>
     </message>
     <message>
-        <source>S</source>
+        <source>Sa</source>
         <comment>Saturday</comment>
-        <translation>S</translation>
+        <translation type="obsolete">Sab</translation>
     </message>
     <message>
-        <source>S</source>
+        <source>Su</source>
         <comment>Sunday</comment>
-        <translation>D</translation>
-    </message>
-    <message>
-        <source>p</source>
-        <translation>p</translation>
+        <translation type="obsolete">Dom</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
         <translation>Inizio</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Fine</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Agenda</translation>
     </message>
@@ -535,32 +551,39 @@ Uscire comunque?</translation>
         <translation>Alto</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Ripetuto</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Non Ripetere...</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Note...</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>Modifica Nota</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Pranzo</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Inizio</translation>
     </message>
@@ -695,32 +718,36 @@ Uscire comunque?</translation>
         <translation>anno</translation>
     </message>
     <message>
         <source> and </source>
         <translation> e </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 e </translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, e </translation>
     </message>
+    <message>
+        <source>on </source>
+        <translation>su </translation>
+    </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Evento Ripetuto</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nessuno</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Giorno</translation>
     </message>
     <message>