Merge from BRANCH_1_0.

1 files changed, 45 insertions, 18 deletions

diff --git a/i18n/es/datebook.ts b/i18n/es/datebook.ts
index 499010d..0dad7a2 100644
--- a/i18n/es/datebook.ts
+++ b/i18n/es/datebook.ts
@@ -91,12 +91,16 @@ Libere espacio y vuelva a intentarlo.
         <translation>Cita duplicada</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Editar...</translation>
     </message>
+    <message>
+        <source>error box</source>
+        <translation>diálogo de error</translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>L</translation>
@@ -188,12 +192,16 @@ Libere espacio y vuelva a intentarlo.
         <translation> - </translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplicar</translation>
     </message>
+    <message>
+        <source>Beam this occurence</source>
+        <translation>Emitir esta aparición</translation>
+    </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 PM</translation>
@@ -353,12 +361,20 @@ Libere espacio y vuelva a intentarlo.
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Ene-00. Ene</translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekLstDayHdr</name>
+    <message>
+        <source>MTWTFSSM</source>
+        <comment>Week days</comment>
+        <translation>LMXJVSDL</translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>s</translation>
     </message>
 </context>
@@ -373,49 +389,49 @@ Libere espacio y vuelva a intentarlo.
         <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">Lu</translation>
     </message>
     <message>
-        <source>T</source>
+        <source>Tu</source>
         <comment>Tuesday</comment>
-        <translation>M</translation>
+        <translation type="obsolete">Ma</translation>
     </message>
     <message>
-        <source>W</source>
+        <source>We</source>
         <comment>Wednesday</comment>
-        <translation>M</translation>
+        <translation type="obsolete">Mi</translation>
     </message>
     <message>
-        <source>T</source>
+        <source>Th</source>
         <comment>Thursday</comment>
-        <translation>J</translation>
+        <translation type="obsolete">Ju</translation>
     </message>
     <message>
-        <source>F</source>
+        <source>Fr</source>
         <comment>Friday</comment>
-        <translation>V</translation>
+        <translation type="obsolete">Vi</translation>
     </message>
     <message>
-        <source>S</source>
+        <source>Sa</source>
         <comment>Saturday</comment>
-        <translation>S</translation>
+        <translation type="obsolete">Sa</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">Do</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
@@ -543,12 +559,19 @@ Libere espacio y vuelva a intentarlo.
     <message>
         <source>Note...</source>
         <translation>Nota...</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>Editar Nota</translation>
     </message>
     <message>
@@ -703,12 +726,16 @@ and </source>
 y </translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, y </translation>
     </message>
+    <message>
+        <source>on </source>
+        <translation>en </translation>
+    </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Cita Periódica </translation>