Merge from BRANCH_1_0.

1 files changed, 45 insertions, 18 deletions

diff --git a/i18n/de/datebook.ts b/i18n/de/datebook.ts
index 22dc590..9da48a0 100644
--- a/i18n/de/datebook.ts
+++ b/i18n/de/datebook.ts
@@ -93,12 +93,16 @@ Trozdem beenden?</translation>
         <translation>Termin duplizieren</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Editieren...</translation>
     </message>
+    <message>
+        <source>error box</source>
+        <translation>Fehlerbox</translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>M</translation>
@@ -190,12 +194,16 @@ Trozdem beenden?</translation>
         <translation>-</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplizieren</translation>
     </message>
+    <message>
+        <source>Beam this occurence</source>
+        <translation>Dieses Vorkommen Senden</translation>
+    </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 PM</translation>
@@ -355,12 +363,20 @@ Trozdem beenden?</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>MDMDFSSM</translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>W</translation>
     </message>
 </context>
@@ -375,49 +391,49 @@ Trozdem beenden?</translation>
         <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>M</translation>
+        <translation type="obsolete">Mo</translation>
     </message>
     <message>
-        <source>T</source>
+        <source>Tu</source>
         <comment>Tuesday</comment>
-        <translation>D</translation>
+        <translation type="obsolete">Di</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>D</translation>
+        <translation type="obsolete">Do</translation>
     </message>
     <message>
-        <source>F</source>
+        <source>Fr</source>
         <comment>Friday</comment>
-        <translation>F</translation>
+        <translation type="obsolete">Fr</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>S</translation>
-    </message>
-    <message>
-        <source>p</source>
-        <translation>P</translation>
+        <translation type="obsolete">So</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
@@ -545,12 +561,19 @@ Trozdem beenden?</translation>
     <message>
         <source>Note...</source>
         <translation>Notizen...</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>Notiz bearbeiten</translation>
     </message>
     <message>
@@ -706,12 +729,16 @@ und</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>,
 und</translation>
     </message>
+    <message>
+        <source>on </source>
+        <translation>am</translation>
+    </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Zu wiederholendes Ereignis</translation>